fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 23:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "radeonsi: honor a user-specified pitch on gfx10.3"

Browse source 
This reverts commit c4b5fd9ab0.

It breaks mipmapping. This is only meant to be used by OpenCL, which allows
setting a user pitch for linear images. In all other cases, don't support
a custom pitch.

Fixes: c4b5fd9ab0 "radeonsi: honor a user-specified pitch on gfx10.3"

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6137>
This commit is contained in:
Marek Olšák 2020-07-29 19:06:44 -04:00
parent 15bd3f3712
commit 61c671c97e
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gallium/drivers/radeonsi/si_state.c
View file

@ -3747,26 +3747,12 @@ static void gfx10_make_texture_descriptor(
S_00A00C_BASE_LEVEL(res->nr_samples > 1 ? 0 : first_level) |
S_00A00C_LAST_LEVEL(res->nr_samples > 1 ? util_logbase2(res->nr_samples) : last_level) |
S_00A00C_BC_SWIZZLE(gfx9_border_color_swizzle(desc->swizzle)) | S_00A00C_TYPE(type);
if (res->target == PIPE_TEXTURE_1D ||
res->target == PIPE_TEXTURE_2D) {
/* 1D, 2D, and 2D_MSAA can set a custom pitch for shader resources
* starting with gfx10.3 (ignored if pitch <= width). Other texture
* targets can't. CB and DB can't set a custom pitch for any target.
*/
if (screen->info.chip_class >= GFX10_3)
state[4] = S_00A010_DEPTH(tex->surface.u.gfx9.surf_pitch - 1);
else
state[4] = 0;
} else {
/* Depth is the last accessible layer on gfx9+. The hw doesn't need
* to know the total number of layers.
*/
state[4] = S_00A010_DEPTH((type == V_008F1C_SQ_RSRC_IMG_3D && sampler) ?
depth - 1 : last_layer) |
S_00A010_BASE_ARRAY(first_layer);
}
/* Depth is the the last accessible layer on gfx9+. The hw doesn't need
* to know the total number of layers.
*/
state[4] =
S_00A010_DEPTH((type == V_008F1C_SQ_RSRC_IMG_3D && sampler) ? depth - 1 : last_layer) |
S_00A010_BASE_ARRAY(first_layer);
state[5] = S_00A014_ARRAY_PITCH(!!(type == V_008F1C_SQ_RSRC_IMG_3D && !sampler)) |
S_00A014_MAX_MIP(res->nr_samples > 1 ? util_logbase2(res->nr_samples)
: tex->buffer.b.b.last_level) |