Mesa (master): mesa: Fix misplaced #endif
Ian Romanick
idr at kemper.freedesktop.org
Sat Oct 2 00:01:21 UTC 2010
Module: Mesa
Branch: master
Commit: 69c78bf2c21c239d6064847dd0628f3526d68f9b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69c78bf2c21c239d6064847dd0628f3526d68f9b
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Oct 1 16:23:06 2010 -0700
mesa: Fix misplaced #endif
If FEATURE_texture_s3tc is not defined, FXT1 formats would erroneously
fall through to the MESA_FORMAT_RGBA_FLOAT32 case.
---
src/mesa/main/formats.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index a82aa9c..654ea03 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1339,11 +1339,11 @@ _mesa_format_to_type_and_comps(gl_format format,
case MESA_FORMAT_SRGBA_DXT3:
case MESA_FORMAT_SRGBA_DXT5:
#endif
+#endif
/* XXX generate error instead? */
*datatype = GL_UNSIGNED_BYTE;
*comps = 0;
return;
-#endif
case MESA_FORMAT_RGBA_FLOAT32:
*datatype = GL_FLOAT;
More information about the mesa-commit
mailing list