*/
+#include "errors.h"
#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
+
#include "image.h"
#include "macros.h"
#include "mipmap.h"
#include "texcompress.h"
#include "texcompress_fxt1.h"
#include "texstore.h"
+#include "mtypes.h"
static void
if (srcFormat != GL_RGB ||
srcType != GL_UNSIGNED_BYTE ||
ctx->_ImageTransferState ||
- srcPacking->RowLength != srcWidth ||
+ ALIGN(srcPacking->RowLength, srcPacking->Alignment) != srcWidth ||
srcPacking->SwapBytes) {
/* convert image to RGB/GLubyte */
GLubyte *tempImageSlices[1];
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
+#if UTIL_ARCH_LITTLE_ENDIAN
MESA_FORMAT_R8G8B8A8_UNORM,
+#else
+ MESA_FORMAT_A8B8G8R8_UNORM,
+#endif
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
#define LL_RMS_D 10 /* fault tolerance (maximum delta) */
#define LL_RMS_E 255 /* fault tolerance (maximum error) */
#define ALPHA_TS 2 /* alpha threshold: (255 - ALPHA_TS) deemed opaque */
-#define ISTBLACK(v) (*((GLuint *)(v)) == 0)
-
+static const GLuint zero = 0;
+#define ISTBLACK(v) (memcmp(&(v), &zero, sizeof(zero)) == 0)
/*
* Define a 64-bit unsigned integer type and macros
}
sumL += sum;
}
-
+
nn_comp--;
}
lolo <<= 2;
lolo |= texel;
}
-
+
cc[0] = lolo;
}
}
lolo = ~lolo;
}
-
+
cc[0] = lolo;
}