mesa: add MAX_PIXEL_BYTES define

In a few places we need to allocate space for some number of generic
pixels.  Use this new define instead of a magic number like 16 or
4 * sizeof(GLuint).

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 595da773ba5848fe07807477fc062b8072731795..1f83a5368d7d7ee93b789274ed92755e31913fc4 100644 (file)
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1553,6 +1553,8 @@ _mesa_get_format_bytes(gl_format format)
 {
    const struct gl_format_info *info = _mesa_get_format_info(format);
    ASSERT(info->BytesPerBlock);
+   ASSERT(info->BytesPerBlock <= MAX_PIXEL_BYTES ||
+          _mesa_is_format_compressed(format));
    return info->BytesPerBlock;
 }
 

diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 3960f028e4aecc5bd9d3bcc799b7cd37005c02bc..e6b429d5f37cd984b481c66acb339da5aaae1a72 100644 (file)
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -46,6 +46,14 @@ extern "C" {
 #define MESA_UNSIGNED_BYTE_4_4 (GL_UNSIGNED_BYTE<<1)
 
 
+/**
+ * Max number of bytes for any non-compressed pixel format below, or for
+ * intermediate pixel storage in Mesa.  This should never be less than
+ * 16.  Maybe 32 someday?
+ */
+#define MAX_PIXEL_BYTES 16
+
+
 /**
  * Mesa texture/renderbuffer image formats.
  */