diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-21 13:59:29 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-21 13:59:29 -0700 |
| commit | 4d24b639d160fe485a3e8f7395e7654538be29e0 (patch) | |
| tree | 189413bbaf62937bdcf8ca65c80bb0fb559d43ed /src/mesa/main/mtypes.h | |
| parent | 9705cff2033f1771a39ac3bb78eb5fcea522218a (diff) | |
mesa: use an array for default texture objects
Replace Default1D/2D/3D/Cube/etc with DefaultTex[TEXTURE_x_INDEX].
The same should be done with the Current1D/2D/3D/etc pointers...
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 92fe4cb77d..bd7d6f0784 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2198,18 +2198,8 @@ struct gl_shared_state struct _mesa_HashTable *DisplayList; /**< Display lists hash table */ struct _mesa_HashTable *TexObjects; /**< Texture objects hash table */ - /** - * \name Default texture objects (shared by all multi-texture units) - */ - /*@{*/ - struct gl_texture_object *Default1D; - struct gl_texture_object *Default2D; - struct gl_texture_object *Default3D; - struct gl_texture_object *DefaultCubeMap; - struct gl_texture_object *DefaultRect; - struct gl_texture_object *Default1DArray; - struct gl_texture_object *Default2DArray; - /*@}*/ + /** Default texture objects (shared by all texture units) */ + struct gl_texture_object *DefaultTex[NUM_TEXTURE_TARGETS]; /** * \name Thread safety and statechange notification for texture |