projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/get: Add TYPE_UINT for casting through a GLuint.
[mesa.git]
/
src
/
mesa
/
main
/
texstore.c
diff --git
a/src/mesa/main/texstore.c
b/src/mesa/main/texstore.c
index 4b13c42ed746f9321e1e418aa4770280fdf3a342..615ba63362efe3012adc9a9fb58fc553652d4c20 100644
(file)
--- a/
src/mesa/main/texstore.c
+++ b/
src/mesa/main/texstore.c
@@
-73,8
+73,8
@@
#include "enums.h"
#include "glformats.h"
#include "pixeltransfer.h"
#include "enums.h"
#include "glformats.h"
#include "pixeltransfer.h"
-#include "
../../gallium/auxiliary/util/u_
format_rgb9e5.h"
-#include "
../../gallium/auxiliary/util/u_
format_r11g11b10f.h"
+#include "
util/
format_rgb9e5.h"
+#include "
util/
format_r11g11b10f.h"
enum {
enum {
@@
-87,9
+87,6
@@
enum {
* Texture image storage function.
*/
typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);
* Texture image storage function.
*/
typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);
-static const GLubyte map_identity[6] = { 0, 1, 2, 3, ZERO, ONE };
-static const GLubyte map_3210[6] = { 3, 2, 1, 0, ZERO, ONE };
-static const GLubyte map_1032[6] = { 1, 0, 3, 2, ZERO, ONE };
/**
/**
@@
-906,6
+903,8
@@
_mesa_texstore_memcpy(TEXSTORE_PARAMS)
srcAddr, srcPacking);
return GL_TRUE;
}
srcAddr, srcPacking);
return GL_TRUE;
}
+
+
/**
* Store user data into texture memory.
* Called via glTex[Sub]Image1/2/3D()
/**
* Store user data into texture memory.
* Called via glTex[Sub]Image1/2/3D()
@@
-1244,11
+1243,11
@@
_mesa_store_compressed_teximage(struct gl_context *ctx, GLuint dims,
return;
}
return;
}
-
_mesa_store_compressed_texsubi
mage(ctx, dims, texImage,
-
0, 0, 0,
-
texImage->Width, texImage->Height, texImage->Depth,
-
texImage->TexFormat,
-
imageSize, data);
+
ctx->Driver.CompressedTexSubI
mage(ctx, dims, texImage,
+ 0, 0, 0,
+ texImage->Width, texImage->Height, texImage->Depth,
+ texImage->TexFormat,
+ imageSize, data);
}
}
@@
-1268,16
+1267,16
@@
_mesa_compute_compressed_pixelstore(GLuint dims, mesa_format texFormat,
const struct gl_pixelstore_attrib *packing,
struct compressed_pixelstore *store)
{
const struct gl_pixelstore_attrib *packing,
struct compressed_pixelstore *store)
{
- GLuint bw, bh;
+ GLuint bw, bh
, bd
;
- _mesa_get_format_block_size
(texFormat, &bw, &bh
);
+ _mesa_get_format_block_size
_3d(texFormat, &bw, &bh, &bd
);
store->SkipBytes = 0;
store->TotalBytesPerRow = store->CopyBytesPerRow =
_mesa_format_row_stride(texFormat, width);
store->TotalRowsPerSlice = store->CopyRowsPerSlice =
(height + bh - 1) / bh;
store->SkipBytes = 0;
store->TotalBytesPerRow = store->CopyBytesPerRow =
_mesa_format_row_stride(texFormat, width);
store->TotalRowsPerSlice = store->CopyRowsPerSlice =
(height + bh - 1) / bh;
- store->CopySlices =
depth
;
+ store->CopySlices =
(depth + bd - 1) / bd
;
if (packing->CompressedBlockWidth &&
packing->CompressedBlockSize) {
if (packing->CompressedBlockWidth &&
packing->CompressedBlockSize) {