[Mesa-dev] [PATCH 2/3] mesa: move _mesa_compressed_texture_pixel_storage_error_check()
Brian Paul
brianp at vmware.com
Fri Aug 15 16:04:13 PDT 2014
to pixelstore.c, add const qualifier to the 'packing' parameter.
Add comments.
---
src/mesa/main/pixelstore.c | 42 +++++++++++++++++++++++++++++++++++++++++
src/mesa/main/pixelstore.h | 8 ++++++++
src/mesa/main/texgetimage.c | 7 ++++---
src/mesa/main/teximage.c | 44 +++++++------------------------------------
src/mesa/main/teximage.h | 6 ------
5 files changed, 61 insertions(+), 46 deletions(-)
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index 05f6583..b5df5e6 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -284,3 +284,45 @@ _mesa_init_pixelstore( struct gl_context *ctx )
_mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj,
ctx->Shared->NullBufferObj);
}
+
+
+/**
+ * Check if the given compressed pixel storage parameters are legal.
+ * Record a GL error if illegl.
+ * \return true if legal, false if illegal
+ */
+bool
+_mesa_compressed_pixel_storage_error_check(
+ struct gl_context *ctx,
+ GLint dimensions,
+ const struct gl_pixelstore_attrib *packing,
+ const char *caller)
+{
+ if (!_mesa_is_desktop_gl(ctx) || !packing->CompressedBlockSize)
+ return true;
+
+ if (packing->CompressedBlockWidth &&
+ packing->SkipPixels % packing->CompressedBlockWidth) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "%s(skip-pixels %% block-width)", caller);
+ return false;
+ }
+
+ if (dimensions > 1 &&
+ packing->CompressedBlockHeight &&
+ packing->SkipRows % packing->CompressedBlockHeight) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "%s(skip-rows %% block-height)", caller);
+ return false;
+ }
+
+ if (dimensions > 2 &&
+ packing->CompressedBlockDepth &&
+ packing->SkipImages % packing->CompressedBlockDepth) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "%s(skip-images %% block-depth)", caller);
+ return false;
+ }
+
+ return true;
+}
diff --git a/src/mesa/main/pixelstore.h b/src/mesa/main/pixelstore.h
index 1b5347d..6838454 100644
--- a/src/mesa/main/pixelstore.h
+++ b/src/mesa/main/pixelstore.h
@@ -49,4 +49,12 @@ extern void
_mesa_init_pixelstore( struct gl_context *ctx );
+extern bool
+_mesa_compressed_pixel_storage_error_check(
+ struct gl_context *ctx,
+ GLint dimensions,
+ const struct gl_pixelstore_attrib *packing,
+ const char *caller);
+
+
#endif
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 9b2f721..2c54e4a 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -40,6 +40,7 @@
#include "mtypes.h"
#include "pack.h"
#include "pbo.h"
+#include "pixelstore.h"
#include "texcompress.h"
#include "texgetimage.h"
#include "teximage.h"
@@ -1008,9 +1009,9 @@ getcompressedteximage_error_check(struct gl_context *ctx, GLenum target,
/* Check for invalid pixel storage modes */
dimensions = _mesa_get_texture_dimensions(texImage->TexObject->Target);
- if (!_mesa_compressed_texture_pixel_storage_error_check(ctx, dimensions,
- &ctx->Pack,
- "glGetCompressedTexImageARB")) {
+ if (!_mesa_compressed_pixel_storage_error_check(ctx, dimensions,
+ &ctx->Pack,
+ "glGetCompressedTexImageARB")) {
return GL_TRUE;
}
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 5f8edff..4414a66 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -41,6 +41,7 @@
#include "imports.h"
#include "macros.h"
#include "multisample.h"
+#include "pixelstore.h"
#include "state.h"
#include "texcompress.h"
#include "texcompress_cpal.h"
@@ -2264,36 +2265,6 @@ texture_error_check( struct gl_context *ctx,
}
-bool
-_mesa_compressed_texture_pixel_storage_error_check(struct gl_context *ctx,
- GLint dimensions,
- struct gl_pixelstore_attrib *packing,
- const char *caller)
-{
- if (!_mesa_is_desktop_gl(ctx) || !packing->CompressedBlockSize)
- return true;
-
- if (packing->CompressedBlockWidth && packing->SkipPixels % packing->CompressedBlockWidth) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "%s(skip-pixels %% block-width)", caller);
- return false;
- }
-
- if (dimensions > 1 && packing->CompressedBlockHeight && packing->SkipRows % packing->CompressedBlockHeight) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "%s(skip-rows %% block-height)", caller);
- return false;
- }
-
- if (dimensions > 2 && packing->CompressedBlockDepth && packing->SkipImages % packing->CompressedBlockDepth) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "%s(skip-images %% block-depth)", caller);
- return false;
- }
-
- return true;
-}
-
/**
* Error checking for glCompressedTexImage[123]D().
* Note that the width, height and depth values are not fully error checked
@@ -2403,9 +2374,9 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
}
/* Check for invalid pixel storage modes */
- if (!_mesa_compressed_texture_pixel_storage_error_check(ctx, dimensions,
- &ctx->Unpack,
- "glCompressedTexImage")) {
+ if (!_mesa_compressed_pixel_storage_error_check(ctx, dimensions,
+ &ctx->Unpack,
+ "glCompressedTexImage")) {
return GL_FALSE;
}
@@ -4272,13 +4243,12 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
}
/* Check for invalid pixel storage modes */
- if (!_mesa_compressed_texture_pixel_storage_error_check(ctx, dims,
- &ctx->Unpack,
- "glCompressedTexSubImage")) {
+ if (!_mesa_compressed_pixel_storage_error_check(ctx, dims,
+ &ctx->Unpack,
+ "glCompressedTexSubImage")) {
return GL_FALSE;
}
-
expectedSize = compressed_tex_size(width, height, depth, format);
if (expectedSize != imageSize) {
_mesa_error(ctx, GL_INVALID_VALUE, "glCompressedTexSubImage%uD(size=%d)",
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 52bfa78..4b27381 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -339,12 +339,6 @@ _mesa_TexStorage3DMultisample(GLenum target, GLsizei samples,
GLsizei height, GLsizei depth,
GLboolean fixedsamplelocations);
-bool
-_mesa_compressed_texture_pixel_storage_error_check(struct gl_context *ctx,
- GLint dimensions,
- struct gl_pixelstore_attrib *packing,
- const char *caller);
-
/*@}*/
#ifdef __cplusplus
--
1.7.10.4
More information about the mesa-dev
mailing list