diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-20 16:21:24 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-10-26 14:29:36 +1100 |
| commit | 419de307dc9a2b21d94ca4aa8b81810c5f390f0f (patch) | |
| tree | 9a4cdede29225c47bbce6a0ecc6d6b2027385239 | |
| parent | 3d2a5039987b7182e775949ee1a4a63ea70ab289 (diff) | |
glsl: set patch inputs read directly in shader_info
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
| -rw-r--r-- | src/compiler/glsl/ir_set_program_inouts.cpp | 4 | ||||
| -rw-r--r-- | src/compiler/shader_info.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp index 7cd5d0ca0c6..91fa0fcb049 100644 --- a/src/compiler/glsl/ir_set_program_inouts.cpp +++ b/src/compiler/glsl/ir_set_program_inouts.cpp @@ -111,7 +111,7 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len, if (var->data.mode == ir_var_shader_in) { if (is_patch_generic) - prog->PatchInputsRead |= bitfield; + prog->info.patch_inputs_read |= bitfield; else prog->info.inputs_read |= bitfield; @@ -430,7 +430,7 @@ do_set_program_inouts(exec_list *instructions, struct gl_program *prog, prog->info.outputs_written = 0; prog->SecondaryOutputsWritten = 0; prog->info.outputs_read = 0; - prog->PatchInputsRead = 0; + prog->info.patch_inputs_read = 0; prog->PatchOutputsWritten = 0; prog->SystemValuesRead = 0; if (shader_stage == MESA_SHADER_FRAGMENT) { diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c index af8b6c2a1c7..d33a271dae4 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->patch_inputs_read = sh->Program->PatchInputsRead; info->patch_outputs_written = sh->Program->PatchOutputsWritten; info->system_values_read = sh->Program->SystemValuesRead; info->uses_texture_gather = sh->Program->UsesGather; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 468d7544a9a..0469da5f174 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1923,7 +1923,6 @@ struct gl_program struct shader_info info; GLbitfield64 SecondaryOutputsWritten; /**< Subset of OutputsWritten outputs written with non-zero index. */ - GLbitfield PatchInputsRead; /**< VAR[0..31] usage for patch inputs (user-defined only) */ GLbitfield PatchOutputsWritten; /**< VAR[0..31] usage for patch outputs (user-defined only) */ GLbitfield SystemValuesRead; /**< Bitmask of SYSTEM_VALUE_x inputs used */ GLbitfield TexturesUsed[MAX_COMBINED_TEXTURE_IMAGE_UNITS]; /**< TEXTURE_x_BIT bitmask */ |