fix some 0->NULLs

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

diff --git a/src/mesa/drivers/dri/common/depthtmp.h b/src/mesa/drivers/dri/common/depthtmp.h
index d8b8775ae99768348d5efb006c0deb1ee67ac105..ad26e6b8914ff648aebcaa059c299812d2f1f582 100644 (file)
--- a/src/mesa/drivers/dri/common/depthtmp.h
+++ b/src/mesa/drivers/dri/common/depthtmp.h
@@ -45,15 +45,15 @@ static void TAG(WriteDepthSpan)( GLcontext *ctx,
               GLint i = 0;
               CLIPSPAN( x, y, n, x1, n1, i );
 
-              if ( DBG ) fprintf( stderr, "WriteDepthSpan %d..%d (x1 %d)\n",
-                                  (int)i, (int)n1, (int)x1 );
+              if ( DBG ) fprintf( stderr, "WriteDepthSpan %d..%d (x1 %d) (mask %p)\n",
+                                  (int)i, (int)n1, (int)x1, mask );
 
               if ( mask ) {
-                 for ( ; i < n1 ; i++, x1++ ) {
+                 for ( ; n1>0 ; i++, x1++, n1-- ) {
                     if ( mask[i] ) WRITE_DEPTH( x1, y, depth[i] );
                  }
               } else {
-                 for ( ; i < n1 ; i++, x1++ ) {
+                 for ( ; n1>0 ; i++, x1++, n1-- ) {
                     WRITE_DEPTH( x1, y, depth[i] );
                  }
               }
@@ -87,11 +87,11 @@ static void TAG(WriteMonoDepthSpan)( GLcontext *ctx,
                                   __FUNCTION__, (int)i, (int)n1, (int)x1, (GLuint)depth );
 
               if ( mask ) {
-                 for ( ; i < n1 ; i++, x1++ ) {
+                 for ( ; n1>0 ; i++, x1++, n1-- ) {
                     if ( mask[i] ) WRITE_DEPTH( x1, y, depth );
                  }
               } else {
-                 for ( ; i < n1 ; i++, x1++ ) {
+                 for ( ; n1>0 ; x1++, n1-- ) {
                     WRITE_DEPTH( x1, y, depth );
                  }
               }
@@ -111,7 +111,7 @@ static void TAG(WriteDepthPixels)( GLcontext *ctx,
 {
    HW_WRITE_LOCK()
       {
-        GLint i;
+        GLuint i;
         LOCAL_DEPTH_VARS;
 
         if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" );
@@ -162,8 +162,9 @@ static void TAG(ReadDepthSpan)( GLcontext *ctx,
            {
               GLint i = 0;
               CLIPSPAN( x, y, n, x1, n1, i );
-              for ( ; i < n1 ; i++ )
-                 READ_DEPTH( depth[i], (x1+i), y );
+              for ( ; n1>0 ; i++, n1-- ) {
+                 READ_DEPTH( depth[i], x+i, y );
+              }
            }
         HW_ENDCLIPLOOP();
 #endif
@@ -177,7 +178,7 @@ static void TAG(ReadDepthPixels)( GLcontext *ctx, GLuint n,
 {
    HW_READ_LOCK()
       {
-        GLint i;
+        GLuint i;
         LOCAL_DEPTH_VARS;
 
         if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" );