diff options
| author | Keith Whitwell <[email protected]> | 2008-09-21 19:29:15 -0700 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-21 22:13:52 -0700 |
| commit | 34a61c66fd1b625a5606b795d192a49632ff1787 (patch) | |
| tree | 6c185413739b4af3b9790df17dc53a76a32f2312 /src/mesa/main/texobj.c | |
| parent | 24172fe595eede2649dd88363d2cda68f928a03e (diff) | |
mesa: refactor: move #define FEATURE flags into new mfeatures.h file
Also, check the FEATURE flags in many places.
(cherry picked from commit 40d1a40f294f1ed2dacfad6f5498322fc08cc2d1)
Conflicts:
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 3d0977d3622..2a54ff7ff90 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -29,7 +29,9 @@ #include "glheader.h" +#if FEATURE_colortable #include "colortab.h" +#endif #include "context.h" #include "enums.h" #include "fbobject.h" @@ -187,7 +189,9 @@ _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj ) */ texObj->Target = 0x99; +#if FEATURE_colortable _mesa_free_colortable_data(&texObj->Palette); +#endif /* free the texture images */ for (face = 0; face < 6; face++) { |