AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: minor improvements to _mesa_compute_compressed_pixelstore()

Browse Source 
Replace the gl_texture_image parameter with mesa_format since we only
used the image's format.

Add some comments.

Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Brian Paul
2014-08-15 15:21:01 -06:00
parent 1e594d4f5c
commit 9b4c6da7f0
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/texgetimage.c
+1 -1
View File
@@ -693,7 +693,7 @@ _mesa_get_compressed_teximage(struct gl_context *ctx,
GLuint i, slice;
GLubyte *dest;
_mesa_compute_compressed_pixelstore(dimensions, texImage,
_mesa_compute_compressed_pixelstore(dimensions, texImage->TexFormat,
texImage->Width, texImage->Height,
texImage->Depth,
&ctx->Pack,
src/mesa/main/texstore.c
+17 -7
View File
@@ -2191,14 +2191,23 @@ _mesa_store_compressed_teximage(struct gl_context *ctx, GLuint dims,
}
/**
* Compute compressed_pixelstore parameters for copying compressed
* texture data.
* \param dims number of texture image dimensions: 1, 2 or 3
* \param texFormat the compressed texture format
* \param width, height, depth size of image to copy
* \param packing pixelstore parameters describing user-space image packing
* \param store returns the compressed_pixelstore parameters
*/
void
_mesa_compute_compressed_pixelstore(GLuint dims, struct gl_texture_image *texImage,
GLsizei width, GLsizei height, GLsizei depth,
const struct gl_pixelstore_attrib *packing,
struct compressed_pixelstore *store)
_mesa_compute_compressed_pixelstore(GLuint dims, mesa_format texFormat,
GLsizei width, GLsizei height,
GLsizei depth,
const struct gl_pixelstore_attrib *packing,
struct compressed_pixelstore *store)
{
GLuint bw, bh;
const mesa_format texFormat = texImage->TexFormat;
_mesa_get_format_block_size(texFormat, &bw, &bh);
@@ -2268,8 +2277,9 @@ _mesa_store_compressed_texsubimage(struct gl_context *ctx, GLuint dims,
return;
}
_mesa_compute_compressed_pixelstore(dims, texImage, width, height, depth,
&ctx->Unpack, &store);
_mesa_compute_compressed_pixelstore(dims, texImage->TexFormat,
width, height, depth,
&ctx->Unpack, &store);
/* get pointer to src pixels (may be in a pbo which we'll map here) */
data = _mesa_validate_pbo_compressed_teximage(ctx, dims, imageSize, data,
src/mesa/main/texstore.h
+5 -4
View File
@@ -150,10 +150,11 @@ struct compressed_pixelstore {
extern void
_mesa_compute_compressed_pixelstore(GLuint dims, struct gl_texture_image *texImage,
GLsizei width, GLsizei height, GLsizei depth,
const struct gl_pixelstore_attrib *packing,
struct compressed_pixelstore *store);
_mesa_compute_compressed_pixelstore(GLuint dims, mesa_format texFormat,
GLsizei width, GLsizei height,
GLsizei depth,
const struct gl_pixelstore_attrib *packing,
struct compressed_pixelstore *store);
#endif