Merge branch 'master' into gallium-sampler-view

[mesa.git] / src / gallium / drivers / i965 / brw_wm_sampler_state.c

diff --git a/src/gallium/drivers/i965/brw_wm_sampler_state.c b/src/gallium/drivers/i965/brw_wm_sampler_state.c
index a4bfa61ab306d994e881fb019133056798faba6d..3f18062c584dc8129ee29f10c34e3a21ec197ebf 100644 (file)
--- a/src/gallium/drivers/i965/brw_wm_sampler_state.c
+++ b/src/gallium/drivers/i965/brw_wm_sampler_state.c
@@ -130,15 +130,14 @@ brw_wm_sampler_update_default_colors(struct brw_context *brw)
       const struct brw_texture *tex = brw_texture(brw->curr.fragment_sampler_views[i]->texture);
       const struct brw_sampler *sampler = brw->curr.sampler[i];
       const float *bc;
-
+      float bordercolor[4] = {
+         sampler->border_color[0],
+         sampler->border_color[0],
+         sampler->border_color[0],
+         sampler->border_color[0]
+      };
+      
       if (util_format_is_depth_or_stencil(tex->base.format)) {
-        float bordercolor[4] = {
-           sampler->border_color[0],
-           sampler->border_color[0],
-           sampler->border_color[0],
-           sampler->border_color[0]
-        };
-         
          bc = bordercolor;
       }
       else {