diff options
| author | Vinson Lee <vlee@vmware.com> | 2010-02-21 00:24:05 -0800 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2010-02-21 00:24:05 -0800 |
| commit | f56c9c2b198dc740fd1559157a160b8a9d0de7a5 (patch) | |
| tree | ec5910c95ccf1918d65db3fbbc9fae718d039993 | |
| parent | 1207482a0340bfe92e2ff764e55d619c8036a47d (diff) | |
i965g: Fix use of out-of-scope variable.
| -rw-r--r-- | src/gallium/drivers/i965/brw_wm_sampler_state.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gallium/drivers/i965/brw_wm_sampler_state.c b/src/gallium/drivers/i965/brw_wm_sampler_state.c index a8bc31c9cef..6a6086fc51b 100644 --- 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.texture[i]); 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 { |