diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-09-24 10:17:26 +1000 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-09-24 10:17:26 +1000 |
| commit | 29c174a3e57c9d6ea36fcfb75e0a04b76fc03ee6 (patch) | |
| tree | fe3105f5149e6e1eedcc891cd1c8cdc7a1677f32 /src/compiler/glsl/link_varyings.cpp | |
| parent | 943b69cddd2ae90e0b0fcab2dff4a7eea81bb3cc (diff) | |
| download | external_mesa3d-29c174a3e57c9d6ea36fcfb75e0a04b76fc03ee6.zip external_mesa3d-29c174a3e57c9d6ea36fcfb75e0a04b76fc03ee6.tar.gz external_mesa3d-29c174a3e57c9d6ea36fcfb75e0a04b76fc03ee6.tar.bz2 | |
Revert "glsl: move xfb BufferStride into gl_transform_feedback_info"
This reverts commit f5a6aab4031bc4754756c1773411728ad9a73381.
This broke some tests. It seems gl_transform_feedback_info gets memset
to 0 so we were losing the values in BufferStride before we used them.
Diffstat (limited to 'src/compiler/glsl/link_varyings.cpp')
| -rw-r--r-- | src/compiler/glsl/link_varyings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index e339823..e622b3e 100644 --- a/src/compiler/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp @@ -1136,11 +1136,11 @@ store_tfeedback_info(struct gl_context *ctx, struct gl_shader_program *prog, /* Apply any xfb_stride global qualifiers */ if (has_xfb_qualifiers) { for (unsigned j = 0; j < MAX_FEEDBACK_BUFFERS; j++) { - if (prog->LinkedTransformFeedback.BufferStride[j]) { + if (prog->TransformFeedback.BufferStride[j]) { buffers |= 1 << j; explicit_stride[j] = true; prog->LinkedTransformFeedback.Buffers[j].Stride = - prog->LinkedTransformFeedback.BufferStride[j] / 4; + prog->TransformFeedback.BufferStride[j] / 4; } } } |