patches for clearing hw depth buffers from software fallback (Nicolai Haehnle)

diff --git a/src/mesa/drivers/dri/common/depthtmp.h b/src/mesa/drivers/dri/common/depthtmp.h
index f3da61e..74ebd6d 100644 (file)
--- a/src/mesa/drivers/dri/common/depthtmp.h
+++ b/src/mesa/drivers/dri/common/depthtmp.h
@@ -64,6 +64,42 @@ static void TAG(WriteDepthSpan)( GLcontext *ctx,
    HW_WRITE_UNLOCK();
 }
 
+static void TAG(WriteMonoDepthSpan)( GLcontext *ctx,
+                                 GLuint n, GLint x, GLint y,
+                                const GLdepth depth,
+                                const GLubyte mask[] )
+{
+   HW_WRITE_LOCK()
+      {
+        GLint x1;
+        GLint n1;
+        LOCAL_DEPTH_VARS;
+
+        y = Y_FLIP( y );
+
+        HW_CLIPLOOP()
+           {
+              GLint i = 0;
+              CLIPSPAN( x, y, n, x1, n1, i );
+
+              if ( DBG ) fprintf( stderr, "%s %d..%d (x1 %d) = %u\n",
+                                  __FUNCTION__, (int)i, (int)n1, (int)x1, (uint)depth );
+
+              if ( mask ) {
+                 for ( ; i < n1 ; i++, x1++ ) {
+                    if ( mask[i] ) WRITE_DEPTH( x1, y, depth );
+                 }
+              } else {
+                 for ( ; i < n1 ; i++, x1++ ) {
+                    WRITE_DEPTH( x1, y, depth );
+                 }
+              }
+           }
+        HW_ENDCLIPLOOP();
+      }
+   HW_WRITE_UNLOCK();
+}
+
 static void TAG(WriteDepthPixels)( GLcontext *ctx,
                                   GLuint n,
                                   const GLint x[],

diff --git a/src/mesa/drivers/dri/common/spantmp.h b/src/mesa/drivers/dri/common/spantmp.h
index 888be04..39d0221 100644 (file)
--- a/src/mesa/drivers/dri/common/spantmp.h
+++ b/src/mesa/drivers/dri/common/spantmp.h
@@ -123,15 +123,29 @@ static void TAG(WriteRGBAPixels)( const GLcontext *ctx,
 
         HW_WRITE_CLIPLOOP()
            {
-              for (i=0;i<n;i++)
+              if (mask)
+              {
+                 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
               {
-                 if (mask[i]) {
+                 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 +174,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();
       }
@@ -186,12 +208,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();
       }
@@ -238,12 +271,23 @@ static void TAG(ReadRGBAPixels)( const GLcontext *ctx,
 
         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();
       }

diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index fc242be..34897ba 100644 (file)
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -1665,13 +1665,33 @@ _swrast_alloc_depth_buffer( GLframebuffer *buffer )
 void
 _swrast_clear_depth_buffer( GLcontext *ctx )
 {
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
    if (ctx->Visual.depthBits == 0
-       || !ctx->DrawBuffer->DepthBuffer
        || !ctx->Depth.Mask) {
       /* no depth buffer, or writing to it is disabled */
       return;
    }
 
+   if (swrast->Driver.WriteMonoDepthSpan) {
+      const GLdepth clearValue = (GLdepth)(ctx->Depth.Clear * ctx->DepthMax);
+      const GLint x = ctx->DrawBuffer->_Xmin;
+      const GLint y = ctx->DrawBuffer->_Ymin;
+      const GLint height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
+      const GLint width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
+      GLint i;
+
+      for (i = 0; i < height; i++) {
+         (*swrast->Driver.WriteMonoDepthSpan)( ctx, width, x, y + i,
+                                               clearValue, NULL );
+      }
+
+      return;
+   }
+
+   if (!ctx->DrawBuffer->DepthBuffer)
+      return;
+
    /* The loops in this function have been written so the IRIX 5.3
     * C compiler can unroll them.  Hopefully other compilers can too!
     */

diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index 9447e99..7fb0d2a 100644 (file)
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -403,6 +403,13 @@ struct swrast_device_driver {
     * depth[i] value if mask[i] is nonzero.
     */
 
+   void (*WriteMonoDepthSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
+                               const GLdepth depth, const GLubyte mask[] );
+   /* Write a horizontal run of depth values.
+    * If mask is NULL, draw all pixels.
+    * If mask is not null, only draw pixel [i] when mask [i] is true.
+    */
+
    void (*ReadDepthSpan)( GLcontext *ctx, GLuint n, GLint x, GLint y,
                           GLdepth depth[] );
    /* Read a horizontal span of values from the depth buffer.