diff options
| author | Kenneth Graunke <[email protected]> | 2011-12-15 13:43:00 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-12-19 16:33:09 -0800 |
| commit | 79d981cd03f2e2e8f67ab21d52711de989bb9a44 (patch) | |
| tree | 1fd5532420dd85caa0badccc2f1e400544d5eb81 /src | |
| parent | c66242a6c69f266eef5c6a5f2a1cece911ea9568 (diff) | |
i965: Don't minify depth when setting up cube map miptrees on Gen4.
Prior to Ironlake, cube maps were stored as 3D textures. In recent
refactoring, we removed a separate "layers" parameter in favor of using
depth. Unfortunately, depth was getting minified, which is only correct
for actual 3D textures.
Fixes piglit tests:
- bugs/crash-cubemap-order
- fbo/fbo-cubemap
- texturing/cubemap
Also changes texturing/cubemap npot from abort to fail.
This hasn't seen a full test run since Piglit on Mesa master hangs
GM45 a lot.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tex_layout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c index eaea49bf55f..4c7e88ce770 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c @@ -124,7 +124,8 @@ brw_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree *mt) mt->total_height += y; width = minify(width); height = minify(height); - depth = minify(depth); + if (mt->target == GL_TEXTURE_3D) + depth = minify(depth); if (mt->compressed) { pack_y_pitch = (height + 3) / 4; |