diff options
| author | Eric Anholt <eric@anholt.net> | 2011-07-11 16:50:06 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-07-13 13:14:09 -0700 |
| commit | 9279c1e55679ff404c296b5a6a23c8d002e63ac3 (patch) | |
| tree | e34490918ec0ef1f7c04018f964ae87bc6575e1b | |
| parent | b8f722a82e6920cb4c83f862c84446c4c5b98712 (diff) | |
i915: Fix NPOT compressed textures on 915.
We were failing at rounding, misplacing the non-baselevels. Fixes:
3DFX_texture_compression_FXT1/fbo-generate-mipmaps
ARB_texture_compression/fbo-generate-mipmaps
EXT_texture_compression_s3tc/fbo-generate-mipmaps
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit f2fd0d63046c41559c5dfca9ebdc5d33c0ae4177)
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_tex_layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_tex_layout.c b/src/mesa/drivers/dri/i915/i915_tex_layout.c index 6e4512129cd..e6a47116223 100644 --- a/src/mesa/drivers/dri/i915/i915_tex_layout.c +++ b/src/mesa/drivers/dri/i915/i915_tex_layout.c @@ -219,9 +219,9 @@ i915_miptree_layout_2d(struct intel_context *intel, width, height, 1); if (mt->compressed) - img_height = MAX2(1, height / 4); + img_height = ALIGN(height, 4) / 4; else - img_height = (MAX2(2, height) + 1) & ~1; + img_height = ALIGN(height, 2); mt->total_height += img_height; |