summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texcompress.c
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2012-09-15 18:15:22 +0100
committerJosé Fonseca <jfonseca@vmware.com>2012-09-15 18:18:39 +0100
commitb6c2234c22d5a935012870fa254e68d026ef265e (patch)
tree46441ab3b3110cd9f9c600b821efee6be8feecc9 /src/mesa/main/texcompress.c
parente78ebbc5f9448d459b57884d90b0a6496294c1dd (diff)
downloadexternal_mesa3d-b6c2234c22d5a935012870fa254e68d026ef265e.zip
external_mesa3d-b6c2234c22d5a935012870fa254e68d026ef265e.tar.gz
external_mesa3d-b6c2234c22d5a935012870fa254e68d026ef265e.tar.bz2
Temporarily revert "mesa: remove remaining FEATURE_* defines where protected by API check."
This reverts commit 9f37b405a3de8668a5f74c9681829688475ac3b7. Fixes windows builds.
Diffstat (limited to 'src/mesa/main/texcompress.c')
-rw-r--r--src/mesa/main/texcompress.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 957cc6d..bb61e6e 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -275,6 +275,7 @@ _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;
@@ -292,6 +293,7 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
n += 10;
}
}
+#endif
return n;
}