From 974e4783a5c7ee9d378124f6dcfc6a0ffd9727db Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 20 Mar 2015 17:10:57 +1000 Subject: [PATCH] mesa: repack gl_texture_attrib. This removes a hole, and puts the large allocation at the end, Acked-by: Brian Paul Reviewed-by: Alex Deucher alexander.deucher@amd.com> Signed-off-by: Dave Airlie --- src/mesa/main/mtypes.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 4e1b4685b42..587507b0b5e 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1388,16 +1388,15 @@ struct gl_texture_unit struct gl_texture_attrib { GLuint CurrentUnit; /**< GL_ACTIVE_TEXTURE */ - struct gl_texture_unit Unit[MAX_COMBINED_TEXTURE_IMAGE_UNITS]; + + /** GL_ARB_seamless_cubemap */ + GLboolean CubeMapSeamless; struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS]; /** GL_ARB_texture_buffer_object */ struct gl_buffer_object *BufferObject; - /** GL_ARB_seamless_cubemap */ - GLboolean CubeMapSeamless; - /** Texture coord units/sets used for fragment texturing */ GLbitfield _EnabledCoordUnits; @@ -1415,6 +1414,8 @@ struct gl_texture_attrib /** Largest index + 1 of texture units that have had any CurrentTex set. */ GLint NumCurrentTexUsed; + + struct gl_texture_unit Unit[MAX_COMBINED_TEXTURE_IMAGE_UNITS]; }; -- 2.30.2