AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "glsl: move xfb BufferStride into gl_transform_feedback_info"

Browse Source 
This reverts commit f5a6aab403.

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.
This commit is contained in:
Timothy Arceri
2016-09-24 10:17:26 +10:00
parent 943b69cddd
commit 29c174a3e5
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/glsl/linker.cpp
+4 -4
View File
@@ -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 "