diff options
| author | Timothy Arceri <[email protected]> | 2016-09-24 10:17:26 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-09-24 10:17:26 +1000 |
| commit | 29c174a3e57c9d6ea36fcfb75e0a04b76fc03ee6 (patch) | |
| tree | fe3105f5149e6e1eedcc891cd1c8cdc7a1677f32 /src/compiler/glsl/linker.cpp | |
| parent | 943b69cddd2ae90e0b0fcab2dff4a7eea81bb3cc (diff) | |
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/linker.cpp')
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 18062848e7a..929a653e137 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1600,19 +1600,19 @@ link_xfb_stride_layout_qualifiers(struct gl_context *ctx, for (unsigned j = 0; j < MAX_FEEDBACK_BUFFERS; j++) { if (linked_shader->info.TransformFeedback.BufferStride[j]) { - prog->LinkedTransformFeedback.BufferStride[j] = + prog->TransformFeedback.BufferStride[j] = linked_shader->info.TransformFeedback.BufferStride[j]; /* We will validate doubles at a later stage */ - if (prog->LinkedTransformFeedback.BufferStride[j] % 4) { + if (prog->TransformFeedback.BufferStride[j] % 4) { linker_error(prog, "invalid qualifier xfb_stride=%d must be a " "multiple of 4 or if its applied to a type that is " "or contains a double a multiple of 8.", - prog->LinkedTransformFeedback.BufferStride[j]); + prog->TransformFeedback.BufferStride[j]); return; } - if (prog->LinkedTransformFeedback.BufferStride[j] / 4 > + if (prog->TransformFeedback.BufferStride[j] / 4 > ctx->Const.MaxTransformFeedbackInterleavedComponents) { linker_error(prog, "The MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS " |