summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/formats.c
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-10-01 16:23:06 -0700
committerIan Romanick <[email protected]>2010-10-01 16:55:35 -0700
commit69c78bf2c21c239d6064847dd0628f3526d68f9b (patch)
tree4e57c4c1b044fbc6c9b6f18ae58bb2d891e92537 /src/mesa/main/formats.c
parent7c6147014a726eefb7a73c8520a0b48a57248a03 (diff)
mesa: Fix misplaced #endif
If FEATURE_texture_s3tc is not defined, FXT1 formats would erroneously fall through to the MESA_FORMAT_RGBA_FLOAT32 case.
Diffstat (limited to 'src/mesa/main/formats.c')
-rw-r--r--src/mesa/main/formats.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index a82aa9c6a0e..654ea038a55 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;