projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: drop unneeded assert
[mesa.git]
/
src
/
mesa
/
main
/
texcompress_bptc.c
diff --git
a/src/mesa/main/texcompress_bptc.c
b/src/mesa/main/texcompress_bptc.c
index c944ac26f34345cca89d279168ebbc0f81367b17..26e59158007c966b0c35f3dde11e7c9c1c095a28 100644
(file)
--- a/
src/mesa/main/texcompress_bptc.c
+++ b/
src/mesa/main/texcompress_bptc.c
@@
-30,6
+30,7
@@
#include "texcompress.h"
#include "texcompress_bptc.h"
#include "util/format_srgb.h"
#include "texcompress.h"
#include "texcompress_bptc.h"
#include "util/format_srgb.h"
+#include "util/half_float.h"
#include "texstore.h"
#include "macros.h"
#include "image.h"
#include "texstore.h"
#include "macros.h"
#include "image.h"
@@
-1291,7
+1292,8
@@
_mesa_texstore_bptc_rgba_unorm(TEXSTORE_PARAMS)
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
- MESA_FORMAT_R8G8B8A8_UNORM,
+ _mesa_little_endian() ? MESA_FORMAT_R8G8B8A8_UNORM
+ : MESA_FORMAT_A8B8G8R8_UNORM,
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
@@
-1630,7
+1632,7
@@
texstore_bptc_rgb_float(TEXSTORE_PARAMS,
GLboolean
_mesa_texstore_bptc_rgb_signed_float(TEXSTORE_PARAMS)
{
GLboolean
_mesa_texstore_bptc_rgb_signed_float(TEXSTORE_PARAMS)
{
-
ASSERT
(dstFormat == MESA_FORMAT_BPTC_RGB_SIGNED_FLOAT);
+
assert
(dstFormat == MESA_FORMAT_BPTC_RGB_SIGNED_FLOAT);
return texstore_bptc_rgb_float(ctx, dims, baseInternalFormat,
dstFormat, dstRowStride, dstSlices,
return texstore_bptc_rgb_float(ctx, dims, baseInternalFormat,
dstFormat, dstRowStride, dstSlices,
@@
-1643,7
+1645,7
@@
_mesa_texstore_bptc_rgb_signed_float(TEXSTORE_PARAMS)
GLboolean
_mesa_texstore_bptc_rgb_unsigned_float(TEXSTORE_PARAMS)
{
GLboolean
_mesa_texstore_bptc_rgb_unsigned_float(TEXSTORE_PARAMS)
{
-
ASSERT
(dstFormat == MESA_FORMAT_BPTC_RGB_UNSIGNED_FLOAT);
+
assert
(dstFormat == MESA_FORMAT_BPTC_RGB_UNSIGNED_FLOAT);
return texstore_bptc_rgb_float(ctx, dims, baseInternalFormat,
dstFormat, dstRowStride, dstSlices,
return texstore_bptc_rgb_float(ctx, dims, baseInternalFormat,
dstFormat, dstRowStride, dstSlices,