fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 17:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Add new pixel pack/unpack state for

Browse source 
ARB_compressed_texture_pixel_storage

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Chris Forbes 2014-05-20 22:37:13 +12:00
parent 1fca84e7a0
commit 75a5823749
3 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/main/get_hash_params.py
View file

@ -541,6 +541,16 @@ descriptor=[
[ "ARRAY_ELEMENT_LOCK_FIRST_EXT", "CONTEXT_INT(Array.LockFirst), NO_EXTRA" ],
[ "ARRAY_ELEMENT_LOCK_COUNT_EXT", "CONTEXT_INT(Array.LockCount), NO_EXTRA" ],
# GL_ARB_compressed_texture_pixel_storage
[ "UNPACK_COMPRESSED_BLOCK_WIDTH", "CONTEXT_INT(Unpack.CompressedBlockWidth), NO_EXTRA" ],
[ "UNPACK_COMPRESSED_BLOCK_HEIGHT", "CONTEXT_INT(Unpack.CompressedBlockHeight), NO_EXTRA" ],
[ "UNPACK_COMPRESSED_BLOCK_DEPTH", "CONTEXT_INT(Unpack.CompressedBlockDepth), NO_EXTRA" ],
[ "UNPACK_COMPRESSED_BLOCK_SIZE", "CONTEXT_INT(Unpack.CompressedBlockSize), NO_EXTRA" ],
[ "PACK_COMPRESSED_BLOCK_WIDTH", "CONTEXT_INT(Pack.CompressedBlockWidth), NO_EXTRA" ],
[ "PACK_COMPRESSED_BLOCK_HEIGHT", "CONTEXT_INT(Pack.CompressedBlockHeight), NO_EXTRA" ],
[ "PACK_COMPRESSED_BLOCK_DEPTH", "CONTEXT_INT(Pack.CompressedBlockDepth), NO_EXTRA" ],
[ "PACK_COMPRESSED_BLOCK_SIZE", "CONTEXT_INT(Pack.CompressedBlockSize), NO_EXTRA" ],
# GL_ARB_transpose_matrix
[ "TRANSPOSE_MODELVIEW_MATRIX_ARB", "CONTEXT_MATRIX_T(ModelviewMatrixStack), NO_EXTRA" ],
[ "TRANSPOSE_PROJECTION_MATRIX_ARB", "CONTEXT_MATRIX_T(ProjectionMatrixStack.Top), NO_EXTRA" ],

4
src/mesa/main/mtypes.h
View file

@ -1502,6 +1502,10 @@ struct gl_pixelstore_attrib
GLboolean SwapBytes;
GLboolean LsbFirst;
GLboolean Invert; /**< GL_MESA_pack_invert */
GLint CompressedBlockWidth; /**< GL_ARB_compressed_texture_pixel_storage */
GLint CompressedBlockHeight;
GLint CompressedBlockDepth;
GLint CompressedBlockSize;
struct gl_buffer_object *BufferObj; /**< GL_ARB_pixel_buffer_object */
};

64
src/mesa/main/pixelstore.c
View file

@ -97,6 +97,34 @@ _mesa_PixelStorei( GLenum pname, GLint param )
goto invalid_enum_error;
ctx->Pack.Invert = param;
break;
case GL_PACK_COMPRESSED_BLOCK_WIDTH:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Pack.CompressedBlockWidth = param;
break;
case GL_PACK_COMPRESSED_BLOCK_HEIGHT:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Pack.CompressedBlockHeight = param;
break;
case GL_PACK_COMPRESSED_BLOCK_DEPTH:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Pack.CompressedBlockDepth = param;
break;
case GL_PACK_COMPRESSED_BLOCK_SIZE:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Pack.CompressedBlockSize = param;
break;
case GL_UNPACK_SWAP_BYTES:
if (!_mesa_is_desktop_gl(ctx))
@ -148,6 +176,34 @@ _mesa_PixelStorei( GLenum pname, GLint param )
goto invalid_value_error;
ctx->Unpack.Alignment = param;
break;
case GL_UNPACK_COMPRESSED_BLOCK_WIDTH:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Unpack.CompressedBlockWidth = param;
break;
case GL_UNPACK_COMPRESSED_BLOCK_HEIGHT:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Unpack.CompressedBlockHeight = param;
break;
case GL_UNPACK_COMPRESSED_BLOCK_DEPTH:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Unpack.CompressedBlockDepth = param;
break;
case GL_UNPACK_COMPRESSED_BLOCK_SIZE:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_enum_error;
if (param<0)
goto invalid_value_error;
ctx->Unpack.CompressedBlockSize = param;
break;
default:
goto invalid_enum_error;
}
@ -188,6 +244,10 @@ _mesa_init_pixelstore( struct gl_context *ctx )
ctx->Pack.SwapBytes = GL_FALSE;
ctx->Pack.LsbFirst = GL_FALSE;
ctx->Pack.Invert = GL_FALSE;
ctx->Pack.CompressedBlockWidth = 0;
ctx->Pack.CompressedBlockHeight = 0;
ctx->Pack.CompressedBlockDepth = 0;
ctx->Pack.CompressedBlockSize = 0;
_mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj,
ctx->Shared->NullBufferObj);
ctx->Unpack.Alignment = 4;
@ -199,6 +259,10 @@ _mesa_init_pixelstore( struct gl_context *ctx )
ctx->Unpack.SwapBytes = GL_FALSE;
ctx->Unpack.LsbFirst = GL_FALSE;
ctx->Unpack.Invert = GL_FALSE;
ctx->Unpack.CompressedBlockWidth = 0;
ctx->Unpack.CompressedBlockHeight = 0;
ctx->Unpack.CompressedBlockDepth = 0;
ctx->Unpack.CompressedBlockSize = 0;
_mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj,
ctx->Shared->NullBufferObj);