summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2007-05-13 08:28:51 +0000
committerOliver McFadden <[email protected]>2007-05-13 08:28:51 +0000
commitb5990cec902be0c599ec4962f0d69d6db2e5ec04 (patch)
tree1f7f19aa189070851baf5573e1acc4face86f7f1 /src/mesa/drivers
parentd93642251e3e984d91b3821349e38f68dc582e3d (diff)
r300: Use #if 0 for disabled code, rather than commenting it out.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/r300/r300_tex.c24
1 files changed, 14 insertions, 10 deletions
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__);