OSDN Git Service

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

index a82aa9c..654ea03 100644 (file)
@@ -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;