From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 1 Oct 2010 23:23:06 +0000 (-0700)
Subject: mesa: Fix misplaced #endif
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69c78bf2c21c239d6064847dd0628f3526d68f9b;p=mesa.git

mesa: Fix misplaced #endif

If FEATURE_texture_s3tc is not defined, FXT1 formats would erroneously
fall through to the MESA_FORMAT_RGBA_FLOAT32 case.
---

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
@@ -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;