[Mesa-dev] [PATCH] gallium/radeon: add an env variable to force a level of aniso filtering
Ian Romanick
idr at freedesktop.org
Mon Apr 11 19:33:56 UTC 2016
radeon and r200 have a driconf option that is similar to this. It sets
a default initial max anisotropy value. Maybe that would be better?
On 04/11/2016 11:48 AM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> ---
> src/gallium/drivers/r600/evergreen_state.c | 10 +++++++---
> src/gallium/drivers/r600/r600_state.c | 10 +++++++---
> src/gallium/drivers/radeon/r600_pipe_common.c | 7 +++++++
> src/gallium/drivers/radeon/r600_pipe_common.h | 3 +++
> src/gallium/drivers/radeonsi/si_state.c | 10 +++++++---
> 5 files changed, 31 insertions(+), 9 deletions(-)
>
> diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
> index 6b6e816..2ad9e3e 100644
> --- a/src/gallium/drivers/r600/evergreen_state.c
> +++ b/src/gallium/drivers/r600/evergreen_state.c
> @@ -561,7 +561,11 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
> static void *evergreen_create_sampler_state(struct pipe_context *ctx,
> const struct pipe_sampler_state *state)
> {
> + struct r600_common_screen *rscreen = (struct r600_common_screen*)ctx->screen;
> struct r600_pipe_sampler_state *ss = CALLOC_STRUCT(r600_pipe_sampler_state);
> + unsigned max_aniso = rscreen->force_aniso >= 0 ? rscreen->force_aniso
> + : state->max_anisotropy;
> + unsigned max_aniso_ratio = r600_tex_aniso_filter(max_aniso);
>
> if (!ss) {
> return NULL;
> @@ -574,10 +578,10 @@ static void *evergreen_create_sampler_state(struct pipe_context *ctx,
> S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) |
> S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) |
> S_03C000_CLAMP_Z(r600_tex_wrap(state->wrap_r)) |
> - S_03C000_XY_MAG_FILTER(eg_tex_filter(state->mag_img_filter, state->max_anisotropy)) |
> - S_03C000_XY_MIN_FILTER(eg_tex_filter(state->min_img_filter, state->max_anisotropy)) |
> + S_03C000_XY_MAG_FILTER(eg_tex_filter(state->mag_img_filter, max_aniso)) |
> + S_03C000_XY_MIN_FILTER(eg_tex_filter(state->min_img_filter, max_aniso)) |
> S_03C000_MIP_FILTER(r600_tex_mipfilter(state->min_mip_filter)) |
> - S_03C000_MAX_ANISO_RATIO(r600_tex_aniso_filter(state->max_anisotropy)) |
> + S_03C000_MAX_ANISO_RATIO(max_aniso_ratio) |
> S_03C000_DEPTH_COMPARE_FUNCTION(r600_tex_compare(state->compare_func)) |
> S_03C000_BORDER_COLOR_TYPE(ss->border_color_use ? V_03C000_SQ_TEX_BORDER_COLOR_REGISTER : 0);
> /* R_03C004_SQ_TEX_SAMPLER_WORD1_0 */
> diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
> index 59fe2f4..91e747f 100644
> --- a/src/gallium/drivers/r600/r600_state.c
> +++ b/src/gallium/drivers/r600/r600_state.c
> @@ -571,7 +571,11 @@ static unsigned r600_tex_filter(unsigned filter, unsigned max_aniso)
> static void *r600_create_sampler_state(struct pipe_context *ctx,
> const struct pipe_sampler_state *state)
> {
> + struct r600_common_screen *rscreen = (struct r600_common_screen*)ctx->screen;
> struct r600_pipe_sampler_state *ss = CALLOC_STRUCT(r600_pipe_sampler_state);
> + unsigned max_aniso = rscreen->force_aniso >= 0 ? rscreen->force_aniso
> + : state->max_anisotropy;
> + unsigned max_aniso_ratio = r600_tex_aniso_filter(max_aniso);
>
> if (!ss) {
> return NULL;
> @@ -585,10 +589,10 @@ static void *r600_create_sampler_state(struct pipe_context *ctx,
> S_03C000_CLAMP_X(r600_tex_wrap(state->wrap_s)) |
> S_03C000_CLAMP_Y(r600_tex_wrap(state->wrap_t)) |
> S_03C000_CLAMP_Z(r600_tex_wrap(state->wrap_r)) |
> - S_03C000_XY_MAG_FILTER(r600_tex_filter(state->mag_img_filter, state->max_anisotropy)) |
> - S_03C000_XY_MIN_FILTER(r600_tex_filter(state->min_img_filter, state->max_anisotropy)) |
> + S_03C000_XY_MAG_FILTER(r600_tex_filter(state->mag_img_filter, max_aniso)) |
> + S_03C000_XY_MIN_FILTER(r600_tex_filter(state->min_img_filter, max_aniso)) |
> S_03C000_MIP_FILTER(r600_tex_mipfilter(state->min_mip_filter)) |
> - S_03C000_MAX_ANISO_RATIO(r600_tex_aniso_filter(state->max_anisotropy)) |
> + S_03C000_MAX_ANISO_RATIO(max_aniso_ratio) |
> S_03C000_DEPTH_COMPARE_FUNCTION(r600_tex_compare(state->compare_func)) |
> S_03C000_BORDER_COLOR_TYPE(ss->border_color_use ? V_03C000_SQ_TEX_BORDER_COLOR_REGISTER : 0);
> /* R_03C004_SQ_TEX_SAMPLER_WORD1_0 */
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index 490cf8b..a7477ab 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -889,6 +889,13 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
> rscreen->chip_class = rscreen->info.chip_class;
> rscreen->debug_flags = debug_get_flags_option("R600_DEBUG", common_debug_options, 0);
>
> + rscreen->force_aniso = MIN2(16, debug_get_num_option("R600_TEX_ANISO", -1));
> + if (rscreen->force_aniso >= 0) {
> + printf("radeon: Forcing anisotropy filter to %ix\n",
> + /* round down to a power of two */
> + 1 << util_logbase2(rscreen->force_aniso));
> + }
> +
> util_format_s3tc_init();
> pipe_mutex_init(rscreen->aux_context_lock);
> pipe_mutex_init(rscreen->gpu_load_mutex);
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
> index 88879b7..a6abe09 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.h
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.h
> @@ -306,6 +306,9 @@ struct r600_common_screen {
> bool has_cp_dma;
> bool has_streamout;
>
> + /* Texture filter settings. */
> + int force_aniso; /* -1 = disabled */
> +
> /* Auxiliary context. Mainly used to initialize resources.
> * It must be locked prior to using and flushed before unlocking. */
> struct pipe_context *aux_context;
> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index 84c8bc8..48d8897 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -3163,8 +3163,12 @@ static void *si_create_sampler_state(struct pipe_context *ctx,
> const struct pipe_sampler_state *state)
> {
> struct si_context *sctx = (struct si_context *)ctx;
> + struct r600_common_screen *rscreen = sctx->b.screen;
> struct si_sampler_state *rstate = CALLOC_STRUCT(si_sampler_state);
> unsigned border_color_type, border_color_index = 0;
> + unsigned max_aniso = rscreen->force_aniso >= 0 ? rscreen->force_aniso
> + : state->max_anisotropy;
> + unsigned max_aniso_ratio = r600_tex_aniso_filter(max_aniso);
>
> if (!rstate) {
> return NULL;
> @@ -3222,7 +3226,7 @@ static void *si_create_sampler_state(struct pipe_context *ctx,
> rstate->val[0] = (S_008F30_CLAMP_X(si_tex_wrap(state->wrap_s)) |
> S_008F30_CLAMP_Y(si_tex_wrap(state->wrap_t)) |
> S_008F30_CLAMP_Z(si_tex_wrap(state->wrap_r)) |
> - S_008F30_MAX_ANISO_RATIO(r600_tex_aniso_filter(state->max_anisotropy)) |
> + S_008F30_MAX_ANISO_RATIO(max_aniso_ratio) |
> 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) |
> @@ -3230,8 +3234,8 @@ static void *si_create_sampler_state(struct pipe_context *ctx,
> 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(eg_tex_filter(state->mag_img_filter, state->max_anisotropy)) |
> - S_008F38_XY_MIN_FILTER(eg_tex_filter(state->min_img_filter, state->max_anisotropy)) |
> + S_008F38_XY_MAG_FILTER(eg_tex_filter(state->mag_img_filter, max_aniso)) |
> + S_008F38_XY_MIN_FILTER(eg_tex_filter(state->min_img_filter, max_aniso)) |
> S_008F38_MIP_FILTER(si_tex_mipfilter(state->min_mip_filter)) |
> S_008F38_MIP_POINT_PRECLAMP(1) |
> S_008F38_DISABLE_LSB_CEIL(1) |
>
More information about the mesa-dev
mailing list