X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexcompress_rgtc.c;h=8cab7a56b1af6174410b4731b13d64be846c9d5e;hb=f04d7439a0ad6e13ff2912ff824553b6bcf511a4;hp=e3042011a71b7eb7fb44e36ea300a759a249ae63;hpb=c540800aa5521023f28eeb288f0d7bb0b67278f3;p=mesa.git

diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c
index e3042011a71..8cab7a56b1a 100644
--- a/src/mesa/main/texcompress_rgtc.c
+++ b/src/mesa/main/texcompress_rgtc.c
@@ -35,7 +35,6 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "colormac.h"
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"
@@ -86,7 +85,7 @@ _mesa_texstore_red_rgtc1(TEXSTORE_PARAMS)
    GLint dstRowDiff, redRowStride;
    GLubyte *tempImageSlices[1];
 
-   ASSERT(dstFormat == MESA_FORMAT_R_RGTC1_UNORM ||
+   assert(dstFormat == MESA_FORMAT_R_RGTC1_UNORM ||
           dstFormat == MESA_FORMAT_L_LATC1_UNORM);
 
    tempImage = malloc(srcWidth * srcHeight * 1 * sizeof(GLubyte));
@@ -139,7 +138,7 @@ _mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS)
    GLint dstRowDiff, redRowStride;
    GLfloat *tempImageSlices[1];
 
-   ASSERT(dstFormat == MESA_FORMAT_R_RGTC1_SNORM ||
+   assert(dstFormat == MESA_FORMAT_R_RGTC1_SNORM ||
           dstFormat == MESA_FORMAT_L_LATC1_SNORM);
 
    redRowStride = 1 * srcWidth * sizeof(GLfloat);
@@ -193,13 +192,15 @@ _mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)
    mesa_format tempFormat;
    GLubyte *tempImageSlices[1];
 
-   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2_UNORM ||
+   assert(dstFormat == MESA_FORMAT_RG_RGTC2_UNORM ||
           dstFormat == MESA_FORMAT_LA_LATC2_UNORM);
 
    if (baseInternalFormat == GL_RG)
-      tempFormat = MESA_FORMAT_R8G8_UNORM;
+      tempFormat = _mesa_little_endian() ? MESA_FORMAT_R8G8_UNORM
+                                         : MESA_FORMAT_G8R8_UNORM;
    else
-      tempFormat = MESA_FORMAT_L8A8_UNORM;
+      tempFormat = _mesa_little_endian() ? MESA_FORMAT_L8A8_UNORM
+                                         : MESA_FORMAT_A8L8_UNORM;
 
    rgRowStride = 2 * srcWidth * sizeof(GLubyte);
    tempImage = malloc(srcWidth * srcHeight * 2 * sizeof(GLubyte));
@@ -258,7 +259,7 @@ _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
    mesa_format tempFormat;
    GLfloat *tempImageSlices[1];
 
-   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2_SNORM ||
+   assert(dstFormat == MESA_FORMAT_RG_RGTC2_SNORM ||
           dstFormat == MESA_FORMAT_LA_LATC2_SNORM);
 
    if (baseInternalFormat == GL_RG)