dri: Remove dead code.
authorVinson Lee <vlee@vmware.com>
Sun, 28 Feb 2010 05:57:38 +0000 (21:57 -0800)
committerVinson Lee <vlee@vmware.com>
Sun, 28 Feb 2010 05:57:38 +0000 (21:57 -0800)
src/mesa/drivers/dri/common/spantmp.h
src/mesa/drivers/dri/common/spantmp2.h

index d5608b880653508adf44680800d48c705df2af4b..cdc4f422ceb29ce2b43be80a465a183f719b7383 100644 (file)
@@ -288,7 +288,6 @@ static void TAG(ReadRGBAPixels)( GLcontext *ctx,
    HW_READ_LOCK()
       {
          GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-         const GLubyte *mask = NULL; /* remove someday */
         GLuint i;
         LOCAL_VARS;
 
@@ -296,23 +295,11 @@ static void TAG(ReadRGBAPixels)( GLcontext *ctx,
 
         HW_READ_CLIPLOOP()
            {
-              if (mask)
-              {
-                 for (i=0;i<n;i++)
-                    if (mask[i]) {
-                       int fy = Y_FLIP( y[i] );
-                       if (CLIPPIXEL( x[i], fy ))
-                          READ_RGBA( rgba[i], x[i], fy );
-                    }
-              }
-              else
-              {
-                 for (i=0;i<n;i++) {
-                    int fy = Y_FLIP( y[i] );
-                    if (CLIPPIXEL( x[i], fy ))
-                       READ_RGBA( rgba[i], x[i], fy );
-                 }
-              }
+               for (i=0;i<n;i++) {
+                  int fy = Y_FLIP( y[i] );
+                  if (CLIPPIXEL( x[i], fy ))
+                     READ_RGBA( rgba[i], x[i], fy );
+               }
            }
         HW_ENDCLIPLOOP();
       }
index c15222690222946417698078139aa611d1535081..98422a8564761b8341413812ea02f7bc6a92f0dc 100644 (file)
@@ -805,7 +805,6 @@ static void TAG(ReadRGBAPixels)( GLcontext *ctx,
    HW_READ_LOCK()
       {
          GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-         GLubyte *mask = NULL; /* remove someday */
         GLint i;
         LOCAL_VARS;
 
@@ -813,23 +812,11 @@ static void TAG(ReadRGBAPixels)( GLcontext *ctx,
 
         HW_READ_CLIPLOOP()
            {
-              if (mask)
-              {
-                 for (i=0;i<n;i++)
-                    if (mask[i]) {
-                       int fy = Y_FLIP( y[i] );
-                       if (CLIPPIXEL( x[i], fy ))
-                          READ_RGBA( rgba[i], x[i], fy );
-                    }
-              }
-              else
-              {
-                 for (i=0;i<n;i++) {
-                    int fy = Y_FLIP( y[i] );
-                    if (CLIPPIXEL( x[i], fy ))
-                       READ_RGBA( rgba[i], x[i], fy );
-                 }
-              }
+               for (i=0;i<n;i++) {
+                  int fy = Y_FLIP( y[i] );
+                     if (CLIPPIXEL( x[i], fy ))
+                        READ_RGBA( rgba[i], x[i], fy );
+               }
            }
         HW_ENDCLIPLOOP();
       }