diff options
| author | Timothy Arceri <[email protected]> | 2016-09-23 13:05:20 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-09-24 09:18:29 +1000 |
| commit | f5a6aab4031bc4754756c1773411728ad9a73381 (patch) | |
| tree | 256bc632e96bdf866d44386d7dbb6dc5ae72880d /src/compiler/glsl/linker.cpp | |
| parent | 85e9bbc14d93fa7166c9ae075ee7ae29a8313e3f (diff) | |
glsl: move xfb BufferStride into gl_transform_feedback_info
It makes more sense to have this here where we store the other values
from xfb qualifiers. The struct it was previously part of is now only
used to store values that come from the api.
Reviewed-by: Alejandro Piñeiro <[email protected]>
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 f3eece233e6..ac4191f2cd5 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -1691,19 +1691,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->TransformFeedback.BufferStride[j] = + prog->LinkedTransformFeedback.BufferStride[j] = linked_shader->info.TransformFeedback.BufferStride[j]; /* We will validate doubles at a later stage */ - if (prog->TransformFeedback.BufferStride[j] % 4) { + if (prog->LinkedTransformFeedback.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->TransformFeedback.BufferStride[j]); + prog->LinkedTransformFeedback.BufferStride[j]); return; } - if (prog->TransformFeedback.BufferStride[j] / 4 > + if (prog->LinkedTransformFeedback.BufferStride[j] / 4 > ctx->Const.MaxTransformFeedbackInterleavedComponents) { linker_error(prog, "The MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS " |