<p dir="ltr"><br>
On Apr 6, 2016 7:23 PM, "Kenneth Graunke" <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> wrote:<br>
><br>
> On Wednesday, April 6, 2016 4:43:39 PM PDT Haixia Shi wrote:<br>
> > It is incorrect to assume BGRA byte order for the GLES3 sRGB workaround.<br>
> ><br>
> > Signed-off-by: Haixia Shi <<a href="mailto:hshi@chromium.org">hshi@chromium.org</a>><br>
> > Reviewed-by: Stéphane Marchesin <<a href="mailto:marcheu@chromium.org">marcheu@chromium.org</a>><br>
> > Cc: <a href="mailto:kenneth.w.graunke@intel.com">kenneth.w.graunke@intel.com</a><br>
> ><br>
> > Change-Id: I5a081d7eaa7544afff0e7874cffef80d3f69a401<br>
> > ---<br>
> >  src/mesa/drivers/dri/i965/brw_context.c | 18 ++++++++++++++++--<br>
> >  1 file changed, 16 insertions(+), 2 deletions(-)<br>
> ><br>
> > diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/<br>
> i965/brw_context.c<br>
> > index 2d480d0..cebfbda 100644<br>
> > --- a/src/mesa/drivers/dri/i965/brw_context.c<br>
> > +++ b/src/mesa/drivers/dri/i965/brw_context.c<br>
> > @@ -1151,9 +1151,23 @@ intel_gles3_srgb_workaround(struct brw_context *brw,<br>
> >      */<br>
> >     fb->Visual.sRGBCapable = false;<br>
> >     for (int i = 0; i < BUFFER_COUNT; i++) {<br>
> > -      if (fb->Attachment[i].Renderbuffer &&<br>
> > -          fb->Attachment[i].Renderbuffer->Format ==<br>
> MESA_FORMAT_B8G8R8A8_SRGB) {<br>
> > +      if (!fb->Attachment[i].Renderbuffer)<br>
> > +         continue;<br>
> > +      switch (fb->Attachment[i].Renderbuffer->Format) {<br>
> > +      case MESA_FORMAT_A8B8G8R8_SRGB:<br>
> > +         fb->Attachment[i].Renderbuffer->Format =<br>
> MESA_FORMAT_A8B8G8R8_UNORM;<br>
> > +         break;<br>
> > +      case MESA_FORMAT_B8G8R8A8_SRGB:<br>
> >           fb->Attachment[i].Renderbuffer->Format =<br>
> MESA_FORMAT_B8G8R8A8_UNORM;<br>
> > +         break;<br>
> > +      case MESA_FORMAT_A8R8G8B8_SRGB:<br>
> > +         fb->Attachment[i].Renderbuffer->Format =<br>
> MESA_FORMAT_A8R8G8B8_UNORM;<br>
> > +         break;<br>
> > +      case MESA_FORMAT_R8G8B8A8_SRGB:<br>
> > +         fb->Attachment[i].Renderbuffer->Format =<br>
> MESA_FORMAT_R8G8B8A8_UNORM;<br>
> > +         break;<br>
> > +      default:<br>
> > +         break;<br>
> >        }<br>
> >     }<br>
> >  }<br>
> ><br>
><br>
> Why don't we simply do:<br>
><br>
>    struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer;<br>
>    rb->Format = _mesa_get_srgb_format_linear(rb->Format);<br>
><br>
> This would handle far more formats than we need to, but that shouldn't<br>
> be a problem.</p>
<p dir="ltr">I'll second that.</p>
<p dir="ltr">> _______________________________________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
><br>
</p>