Changeset 2962 for trunk/src/opengl/mesa/accum.c

Timestamp:

Mar 1, 2000, 7:50:02 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/accum.c (modified) (6 diffs)

trunk/src/opengl/mesa/accum.c

@@ -1 @@
-/* $Id: accum.c,v 1.1 2000-02-29 00:49:57 sandervl Exp $ */
+/* $Id: accum.c,v 1.2 2000-03-01 18:49:22 jeroen Exp $ */
 
 /*
@@ -40 +40 @@
 #endif
 #include "accum.h"
+#include "types.h"
 #include "context.h"
 #include "macros.h"
 #include "masking.h"
 #include "span.h"
-#include "types.h"
 #endif
 
@@ -204 +204 @@
       case GL_ADD:
          {
-            const GLaccum intVal = (GLaccum) (value * acc_scale);
-            GLuint j;
+            const GLaccum intVal = (GLaccum) (value * acc_scale);
+            GLuint j;
             /* Leave optimized accum buffer mode */
             if (ctx->IntegerAccumMode)
                rescale_accum(ctx);
-            for (j = 0; j < height; j++) {
-               GLaccum * acc = ctx->Buffer->Accum + ypos * width4 + 4 * xpos;
+            for (j = 0; j < height; j++) {
+               GLaccum * acc = ctx->Buffer->Accum + ypos * width4 + 4 * xpos;
                GLuint i;
-               for (i = 0; i < width4; i++) {
+               for (i = 0; i < width4; i++) {
                   acc[i] += intVal;
-               }
-               ypos++;
-            }
-         }
-         break;
+               }
+               ypos++;
+            }
+         }
+         break;
 
       case GL_MULT:
-         {
-            GLuint j;
+         {
+            GLuint j;
             /* Leave optimized accum buffer mode */
             if (ctx->IntegerAccumMode)
                rescale_accum(ctx);
-            for (j = 0; j < height; j++) {
-               GLaccum *acc = ctx->Buffer->Accum + ypos * width4 + 4 * xpos;
+            for (j = 0; j < height; j++) {
+               GLaccum *acc = ctx->Buffer->Accum + ypos * width4 + 4 * xpos;
                GLuint i;
-               for (i = 0; i < width4; i++) {
+               for (i = 0; i < width4; i++) {
                   acc[i] = (GLaccum) ( (GLfloat) acc[i] * value );
-               }
-               ypos++;
-            }
-         }
-         break;
+               }
+               ypos++;
+            }
+         }
+         break;
 
       case GL_ACCUM:
@@ -287 +287 @@
          }
          (void) (*ctx->Driver.SetBuffer)( ctx, ctx->Color.DriverDrawBuffer );
-         break;
+         break;
 
       case GL_LOAD:
@@ -470 +470 @@
       /* try to alloc accumulation buffer */
       ctx->Buffer->Accum = (GLaccum *)
-                           MALLOC( buffersize * 4 * sizeof(GLaccum) );
+                           MALLOC( buffersize * 4 * sizeof(GLaccum) );
    }
 
    if (ctx->Buffer->Accum) {
       if (ctx->Scissor.Enabled) {
-         /* Limit clear to scissor box */
-         GLaccum r, g, b, a;
-         GLint i, j;
+         /* Limit clear to scissor box */
+         GLaccum r, g, b, a;
+         GLint i, j;
          GLint width, height;
          GLaccum *row;
-         r = (GLaccum) (ctx->Accum.ClearColor[0] * acc_scale);
-         g = (GLaccum) (ctx->Accum.ClearColor[1] * acc_scale);
-         b = (GLaccum) (ctx->Accum.ClearColor[2] * acc_scale);
-         a = (GLaccum) (ctx->Accum.ClearColor[3] * acc_scale);
+         r = (GLaccum) (ctx->Accum.ClearColor[0] * acc_scale);
+         g = (GLaccum) (ctx->Accum.ClearColor[1] * acc_scale);
+         b = (GLaccum) (ctx->Accum.ClearColor[2] * acc_scale);
+         a = (GLaccum) (ctx->Accum.ClearColor[3] * acc_scale);
          /* size of region to clear */
          width = 4 * (ctx->Buffer->Xmax - ctx->Buffer->Xmin + 1);
@@ -497 +497 @@
                row[i+2] = b;
                row[i+3] = a;
-            }
+            }
             row += 4 * ctx->Buffer->Width;
-         }
+         }
       }
       else {
-         /* clear whole buffer */
-         if (ctx->Accum.ClearColor[0]==0.0 &&
-             ctx->Accum.ClearColor[1]==0.0 &&
-             ctx->Accum.ClearColor[2]==0.0 &&
-             ctx->Accum.ClearColor[3]==0.0) {
-            /* Black */
-            MEMSET( ctx->Buffer->Accum, 0, buffersize * 4 * sizeof(GLaccum) );
-         }
-         else {
-            /* Not black */
-            GLaccum *acc, r, g, b, a;
-            GLuint i;
-
-            acc = ctx->Buffer->Accum;
-            r = (GLaccum) (ctx->Accum.ClearColor[0] * acc_scale);
-            g = (GLaccum) (ctx->Accum.ClearColor[1] * acc_scale);
-            b = (GLaccum) (ctx->Accum.ClearColor[2] * acc_scale);
-            a = (GLaccum) (ctx->Accum.ClearColor[3] * acc_scale);
-            for (i=0;i<buffersize;i++) {
-               *acc++ = r;
-               *acc++ = g;
-               *acc++ = b;
-               *acc++ = a;
-            }
-         }
+         /* clear whole buffer */
+         if (ctx->Accum.ClearColor[0]==0.0 &&
+             ctx->Accum.ClearColor[1]==0.0 &&
+             ctx->Accum.ClearColor[2]==0.0 &&
+             ctx->Accum.ClearColor[3]==0.0) {
+            /* Black */
+            MEMSET( ctx->Buffer->Accum, 0, buffersize * 4 * sizeof(GLaccum) );
+         }
+         else {
+            /* Not black */
+            GLaccum *acc, r, g, b, a;
+            GLuint i;
+
+            acc = ctx->Buffer->Accum;
+            r = (GLaccum) (ctx->Accum.ClearColor[0] * acc_scale);
+            g = (GLaccum) (ctx->Accum.ClearColor[1] * acc_scale);
+            b = (GLaccum) (ctx->Accum.ClearColor[2] * acc_scale);
+            a = (GLaccum) (ctx->Accum.ClearColor[3] * acc_scale);
+            for (i=0;i<buffersize;i++) {
+               *acc++ = r;
+               *acc++ = g;
+               *acc++ = b;
+               *acc++ = a;
+            }
+         }
       }