On Jun 25, 2016 12:24 PM, "Jordan Justen" <<a href="mailto:jordan.l.justen@intel.com">jordan.l.justen@intel.com</a>> wrote: > > This wasn't handled correctly for multi-plane images on gen < 7 in > 727a9b24933d384f5440ed4318fb720ed11d6dd1. > > Reported-by: Mark Janes <<a href="mailto:mark.a.janes@intel.com">mark.a.janes@intel.com</a>> > Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=96674">https://bugs.freedesktop.org/show_bug.cgi?id=96674</a> > Signed-off-by: Jordan Justen <<a href="mailto:jordan.l.justen@intel.com">jordan.l.justen@intel.com</a>> > Cc: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> > Cc: "12.0" <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a>> > --- > src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > 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 d241ec9..eed16ac 100644 > --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > @@ -316,7 +316,8 @@ brw_update_texture_surface(struct gl_context *ctx, > surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, > 6 * 4, 32, surf_offset); > > - uint32_t tex_format = translate_tex_format(brw, intelObj->_Format, > + mesa_format mesa_fmt = plane == 0 ? intelObj->_Format : mt->format; I thought Kristian's original code checked for OES_EXTERNAL in order to determine what format to use. Is it OK to grab it from the intelObj for plane 0? In any case, this is strictly an improvement. Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> > + uint32_t tex_format = translate_tex_format(brw, mesa_fmt, > sampler->sRGBDecode); > > if (for_gather) { > -- > 2.8.1 >