diff options
| author | Timothy Arceri <[email protected]> | 2016-10-20 15:21:06 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | b4b450a5cbd22690b221d0252e6d11f4c0e02ab8 (patch) | |
| tree | 7b6b7fe6176c85c23162c77d427a5d6b7b68bfc1 | |
| parent | 24093975e89178ebee19e4d00fed3d9eb2470c89 (diff) | |
mesa/glsl: set double inputs read directly in shader_info
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/shader_info.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index 4529b6c3cd5..d693b660cbf 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->DoubleInputsRead |= bitfield; + prog->info.double_inputs_read |= bitfield; if (stage == MESA_SHADER_FRAGMENT) { prog->info.fs.uses_sample_qualifier |= var->data.sample; diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c index 2d4292e0a4d..df1abdd2e7a 100644 --- a/src/compiler/shader_info.c +++ b/src/compiler/shader_info.c @@ -30,7 +30,6 @@ copy_shader_info(const struct gl_shader_program *shader_prog, { shader_info *info = &sh->Program->info; - info->double_inputs_read = sh->Program->DoubleInputsRead; info->outputs_written = sh->Program->OutputsWritten; info->outputs_read = sh->Program->OutputsRead; info->patch_inputs_read = sh->Program->PatchInputsRead; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 476ee2dae80..7283f44d3d3 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1922,7 +1922,6 @@ struct gl_program struct shader_info info; - GLbitfield64 DoubleInputsRead; /**< Bitmask of which input regs are read and are doubles */ GLbitfield64 OutputsWritten; /**< Bitmask of which output regs are written */ GLbitfield64 SecondaryOutputsWritten; /**< Subset of OutputsWritten outputs written with non-zero index. */ GLbitfield64 OutputsRead; /**< Bitmask of which output regs are read */ |