mesa: enable GL_EXT_draw_instanced for gles2

[mesa.git] / src / mesa / main / texcompress_rgtc.c

diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c
index f40e4e6c09b337d05bbba786e400e0f9262e493f..6839432966fc5a1a01f4e150e90f6d441d4cfb12 100644 (file)
--- a/src/mesa/main/texcompress_rgtc.c
+++ b/src/mesa/main/texcompress_rgtc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2011 Red Hat Inc.
- * 
+ *
  * block compression parts are:
  * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.
  *
@@ -32,10 +32,11 @@
  * GL_EXT_texture_compression_rgtc support.
  */
 
+#include <stdlib.h>
 
+#include "config.h"
 #include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
+
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"
@@ -197,9 +198,9 @@ _mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_LA_LATC2_UNORM);
 
    if (baseInternalFormat == GL_RG)
-      tempFormat = MESA_FORMAT_R8G8_UNORM;
+      tempFormat = MESA_FORMAT_RG_UNORM8;
    else
-      tempFormat = MESA_FORMAT_L8A8_UNORM;
+      tempFormat = MESA_FORMAT_LA_UNORM8;
 
    rgRowStride = 2 * srcWidth * sizeof(GLubyte);
    tempImage = malloc(srcWidth * srcHeight * 2 * sizeof(GLubyte));