From a1b67da0e1fa6992e5a26506402739cc2143ecf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 19 Apr 2012 09:36:51 +0200 Subject: [PATCH] radeonsi: Fix mip filter encoding in sampler state. Blits are starting to work. --- src/gallium/drivers/radeonsi/evergreen_state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/evergreen_state.c b/src/gallium/drivers/radeonsi/evergreen_state.c index 0b3e8567223..22734142284 100644 --- a/src/gallium/drivers/radeonsi/evergreen_state.c +++ b/src/gallium/drivers/radeonsi/evergreen_state.c @@ -1140,13 +1140,13 @@ static void *si_create_sampler_state(struct pipe_context *ctx, S_008F30_DEPTH_COMPARE_FUNC(si_tex_compare(state->compare_func)) | S_008F30_FORCE_UNNORMALIZED(!state->normalized_coords) | aniso_flag_offset << 16 | /* XXX */ - S_008F30_DISABLE_CUBE_WRAP(!state->seamless_cube_map) | - S_008F30_FILTER_MODE(si_tex_mipfilter(state->min_mip_filter))); + S_008F30_DISABLE_CUBE_WRAP(!state->seamless_cube_map)); 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)) | - S_008F38_XY_MIN_FILTER(si_tex_filter(state->min_img_filter))); + S_008F38_XY_MIN_FILTER(si_tex_filter(state->min_img_filter)) | + S_008F38_MIP_FILTER(si_tex_mipfilter(state->min_mip_filter))); rstate->val[3] = S_008F3C_BORDER_COLOR_TYPE(border_color_type); #if 0