r600g: emit the border color only when it's needed

That depends on the texture wrap modes and filtering.

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index baef36731a42900baa4eb027382f7d53656a567b..3ee125c82090b4d467a5fe31aec2d276489dea13 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -939,8 +939,7 @@ static void *evergreen_create_sampler_state(struct pipe_context *ctx,
                return NULL;
        }
 
-       ss->border_color_use = state->border_color.ui[0] || state->border_color.ui[1] ||
-                              state->border_color.ui[2] || state->border_color.ui[3];
+       ss->border_color_use = sampler_state_needs_border_color(state);
 
        /* R_03C000_SQ_TEX_SAMPLER_WORD0_0 */
        ss->tex_sampler_words[0] =

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index d68a06c78b078faafe40ee9ea77b40756f12c375..2e1d677c79e798ef53e2bf06a5e8dbd65ee0bb25 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -643,6 +643,7 @@ unsigned r600_tex_wrap(unsigned wrap);
 unsigned r600_tex_filter(unsigned filter);
 unsigned r600_tex_mipfilter(unsigned filter);
 unsigned r600_tex_compare(unsigned compare);
+bool sampler_state_needs_border_color(const struct pipe_sampler_state *state);
 
 /*
  * Helpers for building command buffers

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index b74c11ee2b0ef5daa3a290cb78d18ae11858004d..7d07008f16d5af10e7662da146a769142a599666 100644 (file)
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -948,8 +948,7 @@ static void *r600_create_sampler_state(struct pipe_context *ctx,
        }
 
        ss->seamless_cube_map = state->seamless_cube_map;
-       ss->border_color_use = state->border_color.ui[0] || state->border_color.ui[1] ||
-                              state->border_color.ui[2] || state->border_color.ui[3];
+       ss->border_color_use = sampler_state_needs_border_color(state);
 
        /* R_03C000_SQ_TEX_SAMPLER_WORD0_0 */
        ss->tex_sampler_words[0] =

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index ef18f6bcea265c11c28682a0ed7a75d2078a283c..65985c7653db77811227a1e9fa9ac7e2e6db2a06 100644 (file)
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -1523,6 +1523,27 @@ unsigned r600_tex_compare(unsigned compare)
        }
 }
 
+static bool wrap_mode_uses_border_color(unsigned wrap, bool linear_filter)
+{
+       return wrap == PIPE_TEX_WRAP_CLAMP_TO_BORDER ||
+              wrap == PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER ||
+              (linear_filter &&
+               (wrap == PIPE_TEX_WRAP_CLAMP ||
+                wrap == PIPE_TEX_WRAP_MIRROR_CLAMP));
+}
+
+bool sampler_state_needs_border_color(const struct pipe_sampler_state *state)
+{
+       bool linear_filter = state->min_img_filter != PIPE_TEX_FILTER_NEAREST ||
+                            state->mag_img_filter != PIPE_TEX_FILTER_NEAREST;
+
+       return (state->border_color.ui[0] || state->border_color.ui[1] ||
+               state->border_color.ui[2] || state->border_color.ui[3]) &&
+              (wrap_mode_uses_border_color(state->wrap_s, linear_filter) ||
+               wrap_mode_uses_border_color(state->wrap_t, linear_filter) ||
+               wrap_mode_uses_border_color(state->wrap_r, linear_filter));
+}
+
 /* keep this at the end of this file, please */
 void r600_init_common_state_functions(struct r600_context *rctx)
 {