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

Revert "radeonsi: set TRUNC_COORD=0 for Total War: WARHAMMER to fix it"

Browse source 
This reverts commit cd12fcff96.

The terrain looks fine now that TRUNC_COORD=0 for textureGather().

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10036>
(cherry picked from commit 9fb1f9303b)
This commit is contained in:
Rhys Perry 2021-04-06 09:52:26 +01:00 • committed by Eric Engestrom
parent 70e8b11f37
commit a87b2fcfbc
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -733,7 +733,7 @@
"description": "Revert \"radeonsi: set TRUNC_COORD=0 for Total War: WARHAMMER to fix it\"",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "cd12fcff96cc7db794047e2a045142ea861254a2"
},

1
src/gallium/drivers/radeonsi/si_debug_options.h
View file

@ -10,7 +10,6 @@ OPT_BOOL(vs_fetch_always_opencode, false,
OPT_BOOL(prim_restart_tri_strips_only, false, "Only enable primitive restart for triangle strips")
OPT_BOOL(no_infinite_interp, false, "Kill PS with infinite interp coeff")
OPT_BOOL(clamp_div_by_zero, false, "Clamp div by zero (x / 0 becomes FLT_MAX instead of NaN)")
OPT_BOOL(no_trunc_coord, false, "Always set TRUNC_COORD=0")
OPT_BOOL(shader_culling, false, "Cull primitives in shaders when benefical (without tess and GS)")
OPT_BOOL(vrs2x2, false, "Enable 2x2 coarse shading for non-GUI elements")
OPT_BOOL(enable_sam, false, "Enable Smart Access Memory with Above 4G Decoding for unvalidated platforms.")

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

@ -4455,8 +4455,7 @@ static void *si_create_sampler_state(struct pipe_context *ctx,
struct si_sampler_state *rstate = CALLOC_STRUCT(si_sampler_state);
unsigned max_aniso = sscreen->force_aniso >= 0 ? sscreen->force_aniso : state->max_anisotropy;
unsigned max_aniso_ratio = si_tex_aniso_filter(max_aniso);
bool trunc_coord = !sscreen->options.no_trunc_coord &&
state->min_img_filter == PIPE_TEX_FILTER_NEAREST &&
bool trunc_coord = state->min_img_filter == PIPE_TEX_FILTER_NEAREST &&
state->mag_img_filter == PIPE_TEX_FILTER_NEAREST &&
state->compare_mode == PIPE_TEX_COMPARE_NONE;
union pipe_color_union clamped_border_color;

4
src/util/00-mesa-defaults.conf
View file

@ -715,10 +715,6 @@ TODO: document the other workarounds.
<application name="Road Redemption" executable="RoadRedemption.x86_64">
<option name="radeonsi_clamp_div_by_zero" value="true" />
</application>
<!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/3233 -->
<application name="Total War: WARHAMMER" executable="TotalWarhammer">
<option name="radeonsi_no_trunc_coord" value="true" />
</application>
<application name="Wasteland 2" executable="WL2">
<option name="radeonsi_clamp_div_by_zero" value="true" />
</application>