Mesa (master): radeonsi: fix a regression since the resource_copy_region cleanup

Marek Olšák mareko at kemper.freedesktop.org
Fri Jul 31 14:51:32 UTC 2015


Module: Mesa
Branch: master
Commit: 190a40580fdfccf00db93f5c8f15bbf16914be2c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=190a40580fdfccf00db93f5c8f15bbf16914be2c

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Jul 27 19:01:21 2015 +0200

radeonsi: fix a regression since the resource_copy_region cleanup

Broken since:
    46b2b3b - radeonsi: don't change pipe_resource in resource_copy_region

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91444

Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeonsi/si_state.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 86e1624..d0269f0 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2511,7 +2511,7 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
 			  S_008F1C_LAST_LEVEL(texture->nr_samples > 1 ?
 						      util_logbase2(texture->nr_samples) :
 						      last_level) |
-			  S_008F1C_TILING_INDEX(si_tile_mode_index(tmp, 0, false)) |
+			  S_008F1C_TILING_INDEX(si_tile_mode_index(tmp, base_level, false)) |
 			  S_008F1C_POW2_PAD(texture->last_level > 0) |
 			  S_008F1C_TYPE(si_tex_dim(texture->target, texture->nr_samples)));
 	view->state[4] = (S_008F20_DEPTH(depth - 1) | S_008F20_PITCH(pitch - 1));




More information about the mesa-commit mailing list