summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-03-20 17:10:57 +1000
committerDave Airlie <airlied@redhat.com>2015-03-21 08:14:29 +1000
commit974e4783a5c7ee9d378124f6dcfc6a0ffd9727db (patch)
treefb3ff0125d787cbda6bd15c51e0a6295da824158 /src/mesa
parent2dbd8284e72c8b3fe412a7e1c7734e9685fedd7d (diff)
downloadexternal_mesa3d-974e4783a5c7ee9d378124f6dcfc6a0ffd9727db.zip
external_mesa3d-974e4783a5c7ee9d378124f6dcfc6a0ffd9727db.tar.gz
external_mesa3d-974e4783a5c7ee9d378124f6dcfc6a0ffd9727db.tar.bz2
mesa: repack gl_texture_attrib.
This removes a hole, and puts the large allocation at the end, Acked-by: Brian Paul <brianp@vmware.com> Reviewed-by: Alex Deucher alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/mtypes.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 4e1b468..587507b 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];
};