r300: Use #if 0 for disabled code, rather than commenting it out.
authorOliver McFadden <z3ro.geek@gmail.com>
Sun, 13 May 2007 08:28:51 +0000 (08:28 +0000)
committerOliver McFadden <z3ro.geek@gmail.com>
Sun, 13 May 2007 08:28:51 +0000 (08:28 +0000)
src/mesa/drivers/dri/r300/r300_tex.c

index e7b14a0d1714bb8da0c7fbbf560001069cdb5c12..2a21c61162934142567c8426adbc631785147737 100644 (file)
@@ -800,16 +800,20 @@ static void r300CompressedTexImage2D(GLcontext * ctx, GLenum target,
        }
 
        texImage->IsClientData = GL_FALSE;
-/* can't call this, different parameters. Would never evaluate to true anyway currently
-   if (r300ValidateClientStorage( ctx, target, 
-                                 internalFormat,
-                                 width, height,
-                                 format, type, pixels,
-                                 packing, texObj, texImage)) {
-      if (RADEON_DEBUG & DEBUG_TEXTURE)
-        fprintf(stderr, "%s: Using client storage\n", __FUNCTION__);
-   }
-   else */  {
+
+       /* can't call this, different parameters. Would never evaluate to true anyway currently */
+#if 0
+       if (r300ValidateClientStorage(ctx, target,
+                                     internalFormat,
+                                     width, height,
+                                     format, type, pixels,
+                                     packing, texObj, texImage)) {
+               if (RADEON_DEBUG & DEBUG_TEXTURE)
+                       fprintf(stderr, "%s: Using client storage\n",
+                               __FUNCTION__);
+       } else
+#endif
+       {
                if (RADEON_DEBUG & DEBUG_TEXTURE)
                        fprintf(stderr, "%s: Using normal storage\n",
                                __FUNCTION__);