diff options
| author | Timothy Arceri <[email protected]> | 2016-11-09 14:56:08 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-12-02 13:54:47 +1100 |
| commit | ab8c01386ac1c832f3143f57091ed5cf9725c151 (patch) | |
| tree | 00ed2981f5dbe62cedb7c1fc7b51a59966036bca /src/compiler/glsl/link_varyings.cpp | |
| parent | 534917495dca07bb63dbec49450c706fce36f176 (diff) | |
st/mesa/glsl: move Version to gl_shader_program_data
This is mostly just used during linking however the st uses it
when updating textures.
In order to store gl_program in the CurrentProgram array
rather than gl_shader_program we need to move this field to
the shared gl_shader_program_data struct.
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/compiler/glsl/link_varyings.cpp')
| -rw-r--r-- | src/compiler/glsl/link_varyings.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index 308d9c5b9e6..866570c8238 100644 --- a/src/compiler/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp @@ -271,7 +271,7 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog, * OpenGLES 3.0 drivers, so we relax the checking in all cases. */ if (false /* always skip the centroid check */ && - prog->Version < (prog->IsES ? 310 : 430) && + prog->data->Version < (prog->IsES ? 310 : 430) && input->data.centroid != output->data.centroid) { linker_error(prog, "%s shader output `%s' %s centroid qualifier, " @@ -326,7 +326,7 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog, * and fragment shaders must match." */ if (input->data.invariant != output->data.invariant && - prog->Version < (prog->IsES ? 300 : 430)) { + prog->data->Version < (prog->IsES ? 300 : 430)) { linker_error(prog, "%s shader output `%s' %s invariant qualifier, " "but %s shader input %s invariant qualifier\n", @@ -348,7 +348,7 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog, * */ if (input->data.interpolation != output->data.interpolation && - prog->Version < 440) { + prog->data->Version < 440) { linker_error(prog, "%s shader output `%s' specifies %s " "interpolation qualifier, " @@ -2234,7 +2234,7 @@ assign_varying_locations(struct gl_context *ctx, if (var && var->data.mode == ir_var_shader_in && var->data.is_unmatched_generic_inout) { - if (!prog->IsES && prog->Version <= 120) { + if (!prog->IsES && prog->data->Version <= 120) { /* On page 25 (page 31 of the PDF) of the GLSL 1.20 spec: * * Only those varying variables used (i.e. read) in |