summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/mtypes.h
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-09-24 10:17:26 +1000
committerTimothy Arceri <timothy.arceri@collabora.com>2016-09-24 10:17:26 +1000
commit29c174a3e57c9d6ea36fcfb75e0a04b76fc03ee6 (patch)
treefe3105f5149e6e1eedcc891cd1c8cdc7a1677f32 /src/mesa/main/mtypes.h
parent943b69cddd2ae90e0b0fcab2dff4a7eea81bb3cc (diff)
downloadexternal_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/mesa/main/mtypes.h')
-rw-r--r--src/mesa/main/mtypes.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 5bbfd13..85aeb1e 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1696,9 +1696,6 @@ struct gl_transform_feedback_info
struct gl_transform_feedback_varying_info *Varyings;
GLint NumVarying;
- /** Global xfb_stride out qualifier if any */
- GLuint BufferStride[MAX_FEEDBACK_BUFFERS];
-
struct gl_transform_feedback_buffer Buffers[MAX_FEEDBACK_BUFFERS];
};
@@ -2743,6 +2740,8 @@ struct gl_shader_program
*/
struct {
GLenum BufferMode;
+ /** Global xfb_stride out qualifier if any */
+ GLuint BufferStride[MAX_FEEDBACK_BUFFERS];
GLuint NumVarying;
GLchar **VaryingNames; /**< Array [NumVarying] of char * */
} TransformFeedback;