<p dir="ltr">Both of these are also</p>
<p dir="ltr">Reviewed-by: Chris Forbes <<a href="mailto:chrisf@ijw.co.nz">chrisf@ijw.co.nz</a>></p>
<div class="gmail_quote">On Jan 1, 2015 7:48 PM, "Kenneth Graunke" <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The logic in brw_blorp_surface_info::set uses brw_format_for_mesa_format<br>
for source surfaces, and brw->render_target_format[] for destination<br>
surfaces.  We should do the same in the sRGB MSAA overrides.<br>
<br>
Currently, this isn't a problem, since SRGB MSAA buffers are all RGBA.<br>
The next commit will introduce RGBX SRGB MSAA buffers, at which point<br>
we need to get the RGBX -> RGBA format overrides for rendering right.<br>
<br>
Signed-off-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>><br>
---<br>
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 5 +++--<br>
 1 file changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp<br>
index a103af0..936feaf 100644<br>
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp<br>
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp<br>
@@ -1868,8 +1868,9 @@ brw_blorp_blit_params::brw_blorp_blit_params(struct brw_context *brw,<br>
        _mesa_get_format_color_encoding(dst_mt->format) == GL_SRGB &&<br>
        _mesa_get_srgb_format_linear(src_mt->format) ==<br>
        _mesa_get_srgb_format_linear(dst_mt->format)) {<br>
-      dst.brw_surfaceformat = brw_format_for_mesa_format(dst_mt->format);<br>
-      src.brw_surfaceformat = dst.brw_surfaceformat;<br>
+      assert(brw->format_supported_as_render_target[dst_mt->format]);<br>
+      dst.brw_surfaceformat = brw->render_target_format[dst_mt->format];<br>
+      src.brw_surfaceformat = brw_format_for_mesa_format(dst_mt->format);<br>
    }<br>
<br>
    /* When doing a multisample resolve of a GL_LUMINANCE32F or GL_INTENSITY32F<br>
--<br>
2.2.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>