projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2bc8f03
)
mesa: remove FEATURE_ES test in texcompress_cpal.c
author
Brian Paul
<brianp@vmware.com>
Sat, 15 Sep 2012 14:28:16 +0000
(08:28 -0600)
committer
Brian Paul
<brianp@vmware.com>
Sat, 15 Sep 2012 14:28:21 +0000
(08:28 -0600)
Fixes a regression after removing the #if FEATURE_x tests.
src/mesa/main/texcompress_cpal.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texcompress_cpal.c
b/src/mesa/main/texcompress_cpal.c
index ceeec94037678928338c4ec3c0745f3baba849ef..4aa1f610e3252679d74fa2b300474808e14a2144 100644
(file)
--- a/
src/mesa/main/texcompress_cpal.c
+++ b/
src/mesa/main/texcompress_cpal.c
@@
-40,8
+40,6
@@
#include "texcompress_cpal.h"
#include "teximage.h"
-#if FEATURE_ES
-
static const struct cpal_format_info {
GLenum cpal_format;
@@
-226,5
+224,3
@@
_mesa_cpal_compressed_teximage2d(GLenum target, GLint level,
if (saved_align != align)
_mesa_PixelStorei(GL_UNPACK_ALIGNMENT, saved_align);
}
-
-#endif