diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/glsl_to_nir.cpp | 9 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_gather_info.c | 8 | ||||
| -rw-r--r-- | src/compiler/shader_info.h | 10 |
4 files changed, 20 insertions, 9 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index c4ef4f5ce14..29e32cde53c 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -133,13 +133,13 @@ static void nir_remap_attributes(nir_shader *shader) { nir_foreach_variable(var, &shader->inputs) { - var->data.location += _mesa_bitcount_64(shader->info.double_inputs_read & + var->data.location += _mesa_bitcount_64(shader->info.vs.double_inputs & BITFIELD64_MASK(var->data.location)); } /* Once the remap is done, reset double_inputs_read, so later it will have * which location/slots are doubles */ - shader->info.double_inputs_read = 0; + shader->info.vs.double_inputs = 0; } nir_shader * @@ -363,10 +363,11 @@ nir_visitor::visit(ir_variable *ir) } /* Mark all the locations that require two slots */ - if (glsl_type_is_dual_slot(glsl_without_array(var->type))) { + if (shader->info.stage == MESA_SHADER_VERTEX && + glsl_type_is_dual_slot(glsl_without_array(var->type))) { for (uint i = 0; i < glsl_count_attribute_slots(var->type, true); i++) { uint64_t bitfield = BITFIELD64_BIT(var->data.location + i); - shader->info.double_inputs_read |= bitfield; + shader->info.vs.double_inputs |= bitfield; } } break; diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index 90b06b9f417..1b6c8d750b9 100644 --- a/src/compiler/glsl/ir_set_program_inouts.cpp +++ b/src/compiler/glsl/ir_set_program_inouts.cpp @@ -118,7 +118,7 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len, /* double inputs read is only for vertex inputs */ if (stage == MESA_SHADER_VERTEX && var->type->without_array()->is_dual_slot()) - prog->info.double_inputs_read |= bitfield; + prog->info.vs.double_inputs_read |= bitfield; if (stage == MESA_SHADER_FRAGMENT) { prog->info.fs.uses_sample_qualifier |= var->data.sample; diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index 946939657ec..e98129b22c8 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -234,7 +234,8 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader) glsl_type_is_dual_slot(glsl_without_array(var->type))) { for (uint i = 0; i < glsl_count_attribute_slots(var->type, false); i++) { int idx = var->data.location + i; - shader->info.double_inputs_read |= BITFIELD64_BIT(idx); + shader->info.vs.double_inputs |= BITFIELD64_BIT(idx); + shader->info.vs.double_inputs_read |= BITFIELD64_BIT(idx); } } } @@ -356,10 +357,13 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint) shader->info.outputs_written = 0; shader->info.outputs_read = 0; shader->info.patch_outputs_read = 0; - shader->info.double_inputs_read = 0; shader->info.patch_inputs_read = 0; shader->info.patch_outputs_written = 0; shader->info.system_values_read = 0; + if (shader->info.stage == MESA_SHADER_VERTEX) { + shader->info.vs.double_inputs = 0; + shader->info.vs.double_inputs_read = 0; + } if (shader->info.stage == MESA_SHADER_FRAGMENT) { shader->info.fs.uses_sample_qualifier = false; } diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index 4492cad0e8d..f6dedb8d624 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -67,8 +67,6 @@ typedef struct shader_info { /* Which inputs are actually read */ uint64_t inputs_read; - /* Which inputs are actually read and are double */ - uint64_t double_inputs_read; /* Which outputs are actually written */ uint64_t outputs_written; /* Which outputs are actually read */ @@ -110,6 +108,14 @@ typedef struct shader_info { union { struct { + /* Which inputs are doubles */ + uint64_t double_inputs; + + /* Which inputs are actually read and are double */ + uint64_t double_inputs_read; + } vs; + + struct { /** The number of vertices recieves per input primitive */ unsigned vertices_in; |