Module: Mesa Branch: master Commit: f56c9c2b198dc740fd1559157a160b8a9d0de7a5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f56c9c2b198dc740fd1559157a160b8a9d0de7a5
Author: Vinson Lee <[email protected]> Date: Sun Feb 21 00:24:05 2010 -0800 i965g: Fix use of out-of-scope variable. --- 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 a8bc31c..6a6086f 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 { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
