diff options
| author | Daniel Borca <[email protected]> | 2004-10-12 06:42:02 +0000 |
|---|---|---|
| committer | Daniel Borca <[email protected]> | 2004-10-12 06:42:02 +0000 |
| commit | 189f7e31d652064e5c8a4b492206b180c6d99020 (patch) | |
| tree | 6df6cc5f3afdc58913921211b2dbfb5f55d339e9 /src/mesa | |
| parent | 76908ab9d46a46c08815162971395176dfc7780a (diff) | |
avoid the patch if Mesa_DXTn flag is set
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 2ab30f75f66..2ac3ec005dd 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -49,7 +49,7 @@ /* no borders! can't halve 1x1! (stride > width * comp) not allowed */ -void +static void _mesa_halve2x2_teximage2d ( GLcontext *ctx, struct gl_texture_image *texImage, GLuint bytesPerPixel, @@ -1360,7 +1360,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level, #if FX_COMPRESS_S3TC_AS_FXT1_HACK /* [koolsmoky] substitute FXT1 for DXTn and Legacy S3TC */ - if (texImage->IsCompressed) { + if (!ctx->Mesa_DXTn && texImage->IsCompressed) { switch (internalFormat) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_RGB_S3TC: |