projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4936aad
)
mesa: remove FEATURE_ES test in _mesa_get_compressed_formats()
author
Brian Paul
<brianp@vmware.com>
Sun, 23 Sep 2012 00:45:36 +0000
(18:45 -0600)
committer
Ian Romanick
<ian.d.romanick@intel.com>
Tue, 16 Oct 2012 21:57:20 +0000
(14:57 -0700)
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/texcompress.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texcompress.c
b/src/mesa/main/texcompress.c
index bb61e6eda747f75c88fb4b1319cfd2d2df9af775..957cc6df66124058a3e8820e821686f9c27b2cee 100644
(file)
--- a/
src/mesa/main/texcompress.c
+++ b/
src/mesa/main/texcompress.c
@@
-275,7
+275,6
@@
_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
}
}
-#if FEATURE_ES1
if (ctx->API == API_OPENGLES) {
if (formats) {
formats[n++] = GL_PALETTE4_RGB8_OES;
@@
-293,7
+292,6
@@
_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
n += 10;
}
}
-#endif
return n;
}