Added a Spanish translation by David Rubio Miguélezand a Dutch

[mesa.git] / src / mesa / drivers / dri / common / spantmp.h

diff --git a/src/mesa/drivers/dri/common/spantmp.h b/src/mesa/drivers/dri/common/spantmp.h
index 888be0465e5f26c2247e60a358e95c93928be89a..96f26333fcb15bdda8e03d6bfeb6ca99b79a9b3c 100644 (file)
--- a/src/mesa/drivers/dri/common/spantmp.h
+++ b/src/mesa/drivers/dri/common/spantmp.h
@@ -1,3 +1,32 @@
+/*
+ * Copyright 2000-2001 VA Linux Systems, Inc.
+ * (C) Copyright IBM Corporation 2002, 2003
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Keith Whitwell <keithw@tungstengraphics.com>
+ *    Gareth Hughes <gareth@nvidia.com>
+ */
+
 #ifndef DBG
 #define DBG 0
 #endif
@@ -116,22 +145,36 @@ static void TAG(WriteRGBAPixels)( const GLcontext *ctx,
 {
    HW_WRITE_LOCK()
       {
-        GLint i;
+        GLuint i;
         LOCAL_VARS;
 
         if (DBG) fprintf(stderr, "WriteRGBAPixels\n");
 
         HW_WRITE_CLIPLOOP()
            {
-              for (i=0;i<n;i++)
+              if (mask)
               {
-                 if (mask[i]) {
+                 for (i=0;i<n;i++)
+                 {
+                    if (mask[i]) {
+                       const int fy = Y_FLIP(y[i]);
+                       if (CLIPPIXEL(x[i],fy))
+                          WRITE_RGBA( x[i], fy,
+                                      rgba[i][0], rgba[i][1],
+                                      rgba[i][2], rgba[i][3] );
+                    }
+                 }
+              }
+              else
+              {
+                 for (i=0;i<n;i++)
+                 {
                     const int fy = Y_FLIP(y[i]);
                     if (CLIPPIXEL(x[i],fy))
                        WRITE_RGBA( x[i], fy,
                                    rgba[i][0], rgba[i][1],
                                    rgba[i][2], rgba[i][3] );
-                 }
+                 }
               }
            }
         HW_ENDCLIPLOOP();
@@ -160,9 +203,17 @@ static void TAG(WriteMonoRGBASpan)( const GLcontext *ctx,
            {
               GLint i = 0;
               CLIPSPAN(x,y,n,x1,n1,i);
-              for (;n1>0;i++,x1++,n1--)
-                 if (mask[i])
+              if (mask)
+              {
+                 for (;n1>0;i++,x1++,n1--)
+                    if (mask[i])
+                       WRITE_PIXEL( x1, y, p );
+              }
+              else
+              {
+                 for (;n1>0;i++,x1++,n1--)
                     WRITE_PIXEL( x1, y, p );
+              }
            }
         HW_ENDCLIPLOOP();
       }
@@ -178,7 +229,7 @@ static void TAG(WriteMonoRGBAPixels)( const GLcontext *ctx,
 {
    HW_WRITE_LOCK()
       {
-        GLint i;
+        GLuint i;
         LOCAL_VARS;
         INIT_MONO_PIXEL(p, color);
 
@@ -186,12 +237,23 @@ static void TAG(WriteMonoRGBAPixels)( const GLcontext *ctx,
 
         HW_WRITE_CLIPLOOP()
            {
-              for (i=0;i<n;i++)
-                 if (mask[i]) {
+              if (mask)
+              {
+                 for (i=0;i<n;i++)
+                    if (mask[i]) {
+                       int fy = Y_FLIP(y[i]);
+                       if (CLIPPIXEL( x[i], fy ))
+                          WRITE_PIXEL( x[i], fy, p );
+                    }
+              }
+              else
+              {
+                 for (i=0;i<n;i++) {
                     int fy = Y_FLIP(y[i]);
                     if (CLIPPIXEL( x[i], fy ))
                        WRITE_PIXEL( x[i], fy, p );
                  }
+              }
            }
         HW_ENDCLIPLOOP();
       }
@@ -231,19 +293,30 @@ static void TAG(ReadRGBAPixels)( const GLcontext *ctx,
 {
    HW_READ_LOCK()
       {
-        GLint i;
+        GLuint i;
         LOCAL_VARS;
 
         if (DBG) fprintf(stderr, "ReadRGBAPixels\n");
 
         HW_READ_CLIPLOOP()
            {
-              for (i=0;i<n;i++)
-                 if (mask[i]) {
+              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 );
                  }
+              }
            }
         HW_ENDCLIPLOOP();
       }