diff options
| author | Alan Hourihane <[email protected]> | 2008-12-08 14:29:50 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-12-08 14:29:50 +0000 |
| commit | 33a1f495d4bb19288680b9812c6ec1235302d215 (patch) | |
| tree | d47067fe24d530c660b75ee80cdcec72f10d9ed0 /src/mesa/main/texcompress.c | |
| parent | bcd5dda4358a5e47551278477bd00d2c63415c44 (diff) | |
| parent | bdc8ac4426f00eaafbe8ca0d356563efe390294d (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/mesa/main/texcompress.c')
| -rw-r--r-- | src/mesa/main/texcompress.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index 5ad936419b6..0653407048c 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -151,8 +151,6 @@ _mesa_compressed_texture_size( GLcontext *ctx, /* Textures smaller than 8x4 will effectively be made into 8x4 and * take 16 bytes. */ - if (size < 16) - size = 16; return size; #endif #if FEATURE_texture_s3tc @@ -166,8 +164,6 @@ _mesa_compressed_texture_size( GLcontext *ctx, /* Textures smaller than 4x4 will effectively be made into 4x4 and * take 8 bytes. */ - if (size < 8) - size = 8; return size; case MESA_FORMAT_RGBA_DXT3: case MESA_FORMAT_RGBA_DXT5: @@ -179,8 +175,6 @@ _mesa_compressed_texture_size( GLcontext *ctx, /* Textures smaller than 4x4 will effectively be made into 4x4 and * take 16 bytes. */ - if (size < 16) - size = 16; return size; #endif default: |