On 04/01/2012 03:24 PM, nobled wrote: > Noticed by clang: > > brw_wm_surface_state.c:330:30: warning: initializer overrides prior > initialization of this subobject [-Winitializer-overrides] > [MESA_FORMAT_Z24_S8] = 0, > ^ > brw_wm_surface_state.c:326:30: note: previous initialization is here > [MESA_FORMAT_Z24_S8] = 0, > ^ > --- > src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > index 51d3a46..314e2e6 100644 > --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > @@ -327,7 +327,7 @@ brw_format_for_mesa_format(gl_format mesa_format) > [MESA_FORMAT_S8_Z24] = 0, > [MESA_FORMAT_Z16] = 0, > [MESA_FORMAT_X8_Z24] = 0, > - [MESA_FORMAT_Z24_S8] = 0, > + [MESA_FORMAT_Z24_X8] = 0, > [MESA_FORMAT_Z32] = 0, > [MESA_FORMAT_S8] = 0, >
Please annotate the commit messsge with Note: This is a candidate for the 8.0 branch. Looks good. It's Reviewed-by: Chad Versace <[email protected]> _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
