From: Oliver McFadden <z3ro.geek@gmail.com>
Date: Sun, 13 May 2007 08:28:51 +0000 (+0000)
Subject: r300: Use #if 0 for disabled code, rather than commenting it out.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5990cec902be0c599ec4962f0d69d6db2e5ec04;p=mesa.git

r300: Use #if 0 for disabled code, rather than commenting it out.
---

diff --git a/src/mesa/drivers/dri/r300/r300_tex.c b/src/mesa/drivers/dri/r300/r300_tex.c
index e7b14a0d171..2a21c611629 100644
--- a/src/mesa/drivers/dri/r300/r300_tex.c
+++ b/src/mesa/drivers/dri/r300/r300_tex.c
@@ -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__);