From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 6 Sep 2005 02:44:00 +0000 (+0000)
Subject: don't use DEFARRAY/CHECKARRAY stuff
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3622f4f27fe51edff0717e4a42623f62e2936e90;p=mesa.git

don't use DEFARRAY/CHECKARRAY stuff
---

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index cc7c0b22837..d3c919c571d 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -351,17 +351,13 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       }
 
       if (transferOps) {
-         DEFMARRAY(GLfloat, rgbaFloat, MAX_WIDTH, 4);  /* mac 32k limitation */
-         CHECKARRAY(rgbaFloat, return);
-
+         GLfloat rgbaFloat[MAX_WIDTH][4];
          /* convert to float, transfer, convert back to chan */
          chan_span_to_float(width, (CONST GLchan (*)[4]) span.array->rgba,
                             rgbaFloat);
          _mesa_apply_rgba_transfer_ops(ctx, transferOps, width, rgbaFloat);
          float_span_to_chan(width, (CONST GLfloat (*)[4]) rgbaFloat,
                             span.array->rgba);
-
-         UNDEFARRAY(rgbaFloat);  /* mac 32k limitation */
       }
 
       if (ctx->Pixel.PixelTextureEnabled && ctx->Texture._EnabledUnits) {
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 82322c766c3..61ad2c252ea 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -473,15 +473,13 @@ read_rgba_pixels( GLcontext *ctx,
              * there.  This fixes conformance failures with 16-bit color
              * buffers, for example.
              */
-            DEFMARRAY(GLfloat, rgbaf, MAX_WIDTH, 4);  /* mac 32k limitation */
-            CHECKARRAY(rgbaf, return);  /* mac 32k limitation */
+            GLfloat rgbaf[MAX_WIDTH][4];
             _mesa_chan_to_float_span(ctx, readWidth,
                                      (CONST GLchan (*)[4]) rgba, rgbaf);
             _mesa_pack_rgba_span_float(ctx, readWidth,
                                        (CONST GLfloat (*)[4]) rgbaf,
                                        format, type, dst, packing,
                                        ctx->_ImageTransferState);
-            UNDEFARRAY(rgbaf);  /* mac 32k limitation */
          }
          else {
             /* GLubytes are fine */
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index c75d826d2c1..e7eb9bf2e3b 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -2874,8 +2874,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
    GLuint numAlphaArgs;
 
    /* GLchan ccolor[3][4]; */
-   DEFMNARRAY(GLchan, ccolor, 3, 3 * MAX_WIDTH, 4);  /* mac 32k limitation */
-   CHECKARRAY(ccolor, return);  /* mac 32k limitation */
+   GLchan ccolor[3][MAX_WIDTH][4];
 
    ASSERT(ctx->Extensions.EXT_texture_env_combine ||
           ctx->Extensions.ARB_texture_env_combine);
@@ -3509,7 +3508,6 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
 	 rgba[i][ACOMP] = rgba[i][RCOMP];
       }
    }
-   UNDEFARRAY(ccolor);  /* mac 32k limitation */
 }
 #undef PROD