projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7c61470)
mesa: Fix misplaced #endif
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 1 Oct 2010 23:23:06 +0000 (16:23 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 1 Oct 2010 23:55:35 +0000 (16:55 -0700)
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 patch | blob | history

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index a82aa9c6a0ea198aea3c8844422329fbc05ffa4c..654ea038a552a0aaf66d671d16ef0707abeee4c9 100644 (file)
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1338,12 +1338,12 @@ _mesa_format_to_type_and_comps(gl_format format,
    case MESA_FORMAT_SRGBA_DXT1:
    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;