OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/glsl_to_tgsi: plumb the GS output stream qualifier through to TGSI

Browse Source 
Allow drivers to emit GS outputs in a smarter way.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2016-11-29 12:38:48 +01:00
parent cc34a6f0bd
commit 2eaacba7f2
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gallium/auxiliary/tgsi/tgsi_ureg.c
View File

@@ -127,6 +127,7 @@ struct ureg_program
struct {
unsigned semantic_name;
unsigned semantic_index;
unsigned streams;
unsigned usage_mask; /* = TGSI_WRITEMASK_* */
unsigned first;
unsigned last;
@@ -409,6 +410,7 @@ struct ureg_dst
ureg_DECL_output_layout(struct ureg_program *ureg,
unsigned semantic_name,
unsigned semantic_index,
unsigned streams,
unsigned index,
unsigned usage_mask,
unsigned array_id,
@@ -417,6 +419,10 @@ ureg_DECL_output_layout(struct ureg_program *ureg,
unsigned i;
assert(usage_mask != 0);
assert(!(streams & 0x03) || (usage_mask & 1));
assert(!(streams & 0x0c) || (usage_mask & 2));
assert(!(streams & 0x30) || (usage_mask & 4));
assert(!(streams & 0xc0) || (usage_mask & 8));
for (i = 0; i < ureg->nr_outputs; i++) {
if (ureg->output[i].semantic_name == semantic_name &&
@@ -441,9 +447,12 @@ ureg_DECL_output_layout(struct ureg_program *ureg,
}
else {
set_bad( ureg );
i = 0;
}
out:
ureg->output[i].streams |= streams;
return ureg_dst_array_register(TGSI_FILE_OUTPUT, ureg->output[i].first,
array_id);
}
@@ -457,7 +466,7 @@ ureg_DECL_output_masked(struct ureg_program *ureg,
unsigned array_id,
unsigned array_size)
{
return ureg_DECL_output_layout(ureg, name, index,
return ureg_DECL_output_layout(ureg, name, index, 0,
ureg->nr_output_regs, usage_mask, array_id, array_size);
}
@@ -1554,6 +1563,7 @@ emit_decl_semantic(struct ureg_program *ureg,
unsigned last,
unsigned semantic_name,
unsigned semantic_index,
unsigned streams,
unsigned usage_mask,
unsigned array_id)
{
@@ -1574,6 +1584,10 @@ emit_decl_semantic(struct ureg_program *ureg,
out[2].value = 0;
out[2].decl_semantic.Name = semantic_name;
out[2].decl_semantic.Index = semantic_index;
out[2].decl_semantic.StreamX = streams & 3;
out[2].decl_semantic.StreamY = (streams >> 2) & 3;
out[2].decl_semantic.StreamZ = (streams >> 4) & 3;
out[2].decl_semantic.StreamW = (streams >> 6) & 3;
if (array_id) {
out[3].value = 0;
@@ -1878,6 +1892,7 @@ static void emit_decls( struct ureg_program *ureg )
ureg->input[i].last,
ureg->input[i].semantic_name,
ureg->input[i].semantic_index,
0,
TGSI_WRITEMASK_XYZW,
ureg->input[i].array_id);
}
@@ -1891,6 +1906,7 @@ static void emit_decls( struct ureg_program *ureg )
ureg->input[i].semantic_name,
ureg->input[i].semantic_index +
(j - ureg->input[i].first),
0,
TGSI_WRITEMASK_XYZW, 0);
}
}
@@ -1904,6 +1920,7 @@ static void emit_decls( struct ureg_program *ureg )
i,
ureg->system_value[i].semantic_name,
ureg->system_value[i].semantic_index,
0,
TGSI_WRITEMASK_XYZW, 0);
}
@@ -1915,6 +1932,7 @@ static void emit_decls( struct ureg_program *ureg )
ureg->output[i].last,
ureg->output[i].semantic_name,
ureg->output[i].semantic_index,
ureg->output[i].streams,
ureg->output[i].usage_mask,
ureg->output[i].array_id);
}
@@ -1928,6 +1946,7 @@ static void emit_decls( struct ureg_program *ureg )
ureg->output[i].semantic_name,
ureg->output[i].semantic_index +
(j - ureg->output[i].first),
ureg->output[i].streams,
ureg->output[i].usage_mask, 0);
}
}

1
src/gallium/auxiliary/tgsi/tgsi_ureg.h
View File

@@ -251,6 +251,7 @@ struct ureg_dst
ureg_DECL_output_layout(struct ureg_program *,
unsigned semantic_name,
unsigned semantic_index,
unsigned streams,
unsigned index,
unsigned usage_mask,
unsigned array_id,

10
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -339,6 +339,7 @@ struct inout_decl {
unsigned array_id; /* TGSI ArrayID; 1-based: 0 means not an array */
unsigned size;
unsigned interp_loc;
unsigned gs_out_streams;
enum glsl_interp_mode interp;
enum glsl_base_type base_type;
ubyte usage_mask; /* GLSL-style usage-mask, i.e. single bit per double */
@@ -2478,6 +2479,14 @@ glsl_to_tgsi_visitor::visit(ir_dereference_variable *ir)
decl->mesa_index = var->data.location + FRAG_RESULT_MAX * var->data.index;
decl->base_type = type_without_array->base_type;
decl->usage_mask = u_bit_consecutive(component, num_components);
if (var->data.stream & (1u << 31)) {
decl->gs_out_streams = var->data.stream & ~(1u << 31);
} else {
assert(var->data.stream < 4);
decl->gs_out_streams = 0;
for (unsigned i = 0; i < num_components; ++i)
decl->gs_out_streams |= var->data.stream << (2 * (component + i));
}
if (is_inout_array(shader->Stage, var, &remove_array)) {
decl->array_id = num_output_arrays + 1;
@@ -6091,6 +6100,7 @@ st_translate_program(
dst = ureg_DECL_output_layout(ureg,
outputSemanticName[slot], outputSemanticIndex[slot],
decl->gs_out_streams,
slot, tgsi_usage_mask, decl->array_id, decl->size);
for (unsigned j = 0; j < decl->size; ++j) {