fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r600: Pre-EG - Set wrap texture modes to repeat when seemless cube is used

Browse source 
On Pre-Evergreen hardware we have a flag
   "Force Clamp X,Y policy to wrap for CubeMaps"
but it doesn't seem to affect how border clamping is done. With
bf3027 this is set to PIPE_TEX_WRAP_CLAMP_TO_EDGE for cube maps,
and results in the regression reported in #9028.
Forcing repeat mode fixes the issue.

Fixes: bf3027c391
   mesa/st: Normalize wrap modes for seamless cubes

Related: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9028

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23848>
(cherry picked from commit 91fa1970c9)
This commit is contained in:
Gert Wollny 2023-06-25 12:13:23 +02:00 • committed by Eric Engestrom
parent f36154ea23
commit 28f046d189
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2929,7 +2929,7 @@
"description": "r600: Pre-EG - Set wrap texture modes to repeat when seemless cube is used",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "bf3027c3916ad5be172c22851e7172671709a9bc"
},

14
src/gallium/drivers/r600/r600_state.c
View file

@ -1841,6 +1841,20 @@ static void r600_emit_sampler_states(struct r600_context *rctx,
enum pipe_texture_target target = PIPE_BUFFER;
if (rview)
target = rview->base.texture->target;
/* If seamless cube map is set, set the CAMP_(X|Y|Z) to
* SQ_TEX_WRAP which seems to trigger properly ignoring the
* texture wrap mode */
if (target == PIPE_TEXTURE_CUBE ||
target == PIPE_TEXTURE_CUBE_ARRAY) {
if (rstate->seamless_cube_map){
uint32_t mask = ~(S_03C000_CLAMP_X(7) |
S_03C000_CLAMP_Y(7) |
S_03C000_CLAMP_Z(7));
rstate->tex_sampler_words[0] &= mask;
}
}
if (target == PIPE_TEXTURE_1D_ARRAY ||
target == PIPE_TEXTURE_2D_ARRAY) {
rstate->tex_sampler_words[0] |= S_03C000_TEX_ARRAY_OVERRIDE(1);