diff options
| author | Timothy Arceri <[email protected]> | 2016-11-22 20:24:33 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-19 17:05:26 +1100 |
| commit | 4d65f68a9bd225133897bc56c89a0fa9baf6d672 (patch) | |
| tree | 65c5d9ee0283d14922df351d9ea80561e218c3bf /src/compiler/glsl/link_varyings.cpp | |
| parent | e603cf18415adba5f9e879aba3c1146e952eb688 (diff) | |
mesa/glsl: move TransformFeedbackBufferStride to gl_shader
Here we remove the single use of this field in gl_linked_shader
which allows us to move the field out of gl_shader_info
While we are at it we rewrite link_xfb_stride_layout_qualifiers()
to be more clear.
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/compiler/glsl/link_varyings.cpp')
| -rw-r--r-- | src/compiler/glsl/link_varyings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index 6d54a111ea1..8cd364441d3 100644 --- a/src/compiler/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp @@ -108,6 +108,7 @@ create_xfb_varying_names(void *mem_ctx, const glsl_type *t, char **name, static bool process_xfb_layout_qualifiers(void *mem_ctx, const gl_linked_shader *sh, + struct gl_shader_program *prog, unsigned *num_tfeedback_decls, char ***varying_names) { @@ -118,7 +119,7 @@ process_xfb_layout_qualifiers(void *mem_ctx, const gl_linked_shader *sh, * xfb_stride to interface block members so this will catch that case also. */ for (unsigned j = 0; j < MAX_FEEDBACK_BUFFERS; j++) { - if (sh->info.TransformFeedback.BufferStride[j]) { + if (prog->TransformFeedback.BufferStride[j]) { has_xfb_qualifiers = true; break; } @@ -2397,7 +2398,7 @@ link_varyings(struct gl_shader_program *prog, unsigned first, unsigned last, if (prog->_LinkedShaders[i]) { has_xfb_qualifiers = process_xfb_layout_qualifiers(mem_ctx, prog->_LinkedShaders[i], - &num_tfeedback_decls, + prog, &num_tfeedback_decls, &varying_names); break; } |