OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/main: Make FEATURE_colortable follow feature conventions.
[android-x86/external-mesa.git]
/
src
/
mesa
/
main
/
texobj.c
diff --git
a/src/mesa/main/texobj.c
b/src/mesa/main/texobj.c
index
d09c439
..
678845e
100644
(file)
--- a/
src/mesa/main/texobj.c
+++ b/
src/mesa/main/texobj.c
@@
-29,9
+29,7
@@
#include "mfeatures.h"
#include "mfeatures.h"
-#if FEATURE_colortable
#include "colortab.h"
#include "colortab.h"
-#endif
#include "context.h"
#include "enums.h"
#include "fbobject.h"
#include "context.h"
#include "enums.h"
#include "fbobject.h"
@@
-194,9
+192,7
@@
_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
*/
texObj->Target = 0x99;
*/
texObj->Target = 0x99;
-#if FEATURE_colortable
_mesa_free_colortable_data(&texObj->Palette);
_mesa_free_colortable_data(&texObj->Palette);
-#endif
/* free the texture images */
for (face = 0; face < 6; face++) {
/* free the texture images */
for (face = 0; face < 6; face++) {