diff options
author | Dave Airlie <[email protected]> | 2015-03-20 17:10:57 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2015-03-21 08:14:29 +1000 |
commit | 974e4783a5c7ee9d378124f6dcfc6a0ffd9727db (patch) | |
tree | fb3ff0125d787cbda6bd15c51e0a6295da824158 /src/mesa/main | |
parent | 2dbd8284e72c8b3fe412a7e1c7734e9685fedd7d (diff) |
mesa: repack gl_texture_attrib.
This removes a hole, and puts the large allocation at the end,
Acked-by: Brian Paul <[email protected]>
Reviewed-by: Alex Deucher [email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/mtypes.h | 9 |
1 files 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]; }; |