From: Marek Olšák <[email protected]>
copied from the Vulkan driver
---
src/gallium/drivers/radeonsi/si_state.c | 9 +++++++--
src/gallium/drivers/radeonsi/sid.h | 3 +++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_state.c
b/src/gallium/drivers/radeonsi/si_state.c
index 8373632..d6d9d7b 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3227,13 +3227,18 @@ static void *si_create_sampler_state(struct
pipe_context *ctx,
r600_tex_aniso_filter(state->max_anisotropy) << 9 |
S_008F30_DEPTH_COMPARE_FUNC(si_tex_compare(state->compare_func)) |
S_008F30_FORCE_UNNORMALIZED(!state->normalized_coords) |
-
S_008F30_DISABLE_CUBE_WRAP(!state->seamless_cube_map));
+ S_008F30_DISABLE_CUBE_WRAP(!state->seamless_cube_map)
|
+ S_008F30_COMPAT_MODE(sctx->b.chip_class >= VI));
rstate->val[1] = (S_008F34_MIN_LOD(S_FIXED(CLAMP(state->min_lod, 0,
15), 8)) |
S_008F34_MAX_LOD(S_FIXED(CLAMP(state->max_lod, 0,
15), 8)));
rstate->val[2] = (S_008F38_LOD_BIAS(S_FIXED(CLAMP(state->lod_bias, -16,
16), 8)) |
S_008F38_XY_MAG_FILTER(si_tex_filter(state->mag_img_filter) |
aniso_flag_offset) |
S_008F38_XY_MIN_FILTER(si_tex_filter(state->min_img_filter) |
aniso_flag_offset) |
-
S_008F38_MIP_FILTER(si_tex_mipfilter(state->min_mip_filter)));
+
S_008F38_MIP_FILTER(si_tex_mipfilter(state->min_mip_filter)) |
+ S_008F38_MIP_POINT_PRECLAMP(1) |
+ S_008F38_DISABLE_LSB_CEIL(1) |
+ S_008F38_FILTER_PREC_FIX(1) |
+ S_008F38_ANISO_OVERRIDE(sctx->b.chip_class >= VI));
rstate->val[3] = S_008F3C_BORDER_COLOR_PTR(border_color_index) |
S_008F3C_BORDER_COLOR_TYPE(border_color_type);
return rstate;
diff --git a/src/gallium/drivers/radeonsi/sid.h
b/src/gallium/drivers/radeonsi/sid.h
index 80fb8cb..c02a1d2 100644
--- a/src/gallium/drivers/radeonsi/sid.h
+++ b/src/gallium/drivers/radeonsi/sid.h
@@ -2392,6 +2392,9 @@
#define S_008F38_FILTER_PREC_FIX(x) (((x) &
0x1) << 30)
#define G_008F38_FILTER_PREC_FIX(x) (((x) >>
30) & 0x1)
#define C_008F38_FILTER_PREC_FIX
0xBFFFFFFF
+#define S_008F38_ANISO_OVERRIDE(x) (((x) &
0x1) << 31)
+#define G_008F38_ANISO_OVERRIDE(x) (((x) >>
31) & 0x1)
+#define C_008F38_ANISO_OVERRIDE
0x7FFFFFFF
#define R_008F3C_SQ_IMG_SAMP_WORD3
0x008F3C
#define S_008F3C_BORDER_COLOR_PTR(x) (((x) &
0xFFF) << 0)
#define G_008F3C_BORDER_COLOR_PTR(x) (((x) >>
0) & 0xFFF)
--
2.5.0
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
