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_interface_blocks.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_interface_blocks.cpp')
| -rw-r--r-- | src/compiler/glsl/link_interface_blocks.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp index 4e91abc274d..7037c7776de 100644 --- a/src/compiler/glsl/link_interface_blocks.cpp +++ b/src/compiler/glsl/link_interface_blocks.cpp @@ -64,7 +64,7 @@ interstage_member_mismatch(struct gl_shader_program *prog, * interpolation qualifiers of variables of the same name do not * match." */ - if (prog->IsES || prog->Version < 440) + if (prog->IsES || prog->data->Version < 440) if (c->fields.structure[i].interpolation != p->fields.structure[i].interpolation) return true; @@ -83,7 +83,7 @@ interstage_member_mismatch(struct gl_shader_program *prog, * The table in Section 9.2.1 Linked Shaders of the GLSL ES 3.2 spec * says that sample need not match for varyings. */ - if (!prog->IsES || prog->Version < 310) + if (!prog->IsES || prog->data->Version < 310) if (c->fields.structure[i].centroid != p->fields.structure[i].centroid) return true; @@ -114,7 +114,7 @@ intrastage_match(ir_variable *a, */ if ((a->data.how_declared != ir_var_declared_implicitly || b->data.how_declared != ir_var_declared_implicitly) && - (!prog->IsES || prog->Version != 310 || + (!prog->IsES || prog->data->Version != 310 || interstage_member_mismatch(prog, a->get_interface_type(), b->get_interface_type()))) return false; |