From: Nanley Chery Date: Fri, 23 Mar 2018 00:05:34 +0000 (-0700) Subject: i965/meta_util: Re-enable sRGB-encoded fast-clears on CNL X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e8b16e0a239cc4a4758b62fb6787158180a74fd;p=mesa.git i965/meta_util: Re-enable sRGB-encoded fast-clears on CNL The paths which sample with the clear color are now using a getter which performs the sRGB decode needed to enable this fast clear. This path can be exercised by fast-clearing a texture, then performing an operation which requires sRGB decoding. Test coverage for this feature is provided with the following tests: * Shader texture calls: - spec@ext_texture_srgb@tex-srgb * Shader texelfetch calls: - spec@arb_framebuffer_srgb@fbo-fast-clear - spec@arb_framebuffer_srgb@msaa-fast-clear * Blending: - spec@arb_framebuffer_srgb@arb_framebuffer_srgb-fast-clear-blend * Blitting: - spec@arb_framebuffer_srgb@blit texture srgb msaa enabled clear Reviewed-by: Jason Ekstrand --- diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.c b/src/mesa/drivers/dri/i965/brw_meta_util.c index b31181521c7..d292f5a8e24 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_util.c +++ b/src/mesa/drivers/dri/i965/brw_meta_util.c @@ -293,18 +293,7 @@ brw_is_color_fast_clear_compatible(struct brw_context *brw, brw->mesa_to_isl_render_format[mt->format]) return false; - const bool srgb_rb = _mesa_get_srgb_format_linear(mt->format) != mt->format; - /* Gen10 doesn't automatically decode the clear color of sRGB buffers. Since - * we currently don't perform this decode in software, avoid a fast-clear - * altogether. TODO: Do this in software. - */ const mesa_format format = _mesa_get_render_format(ctx, mt->format); - if (devinfo->gen >= 10 && srgb_rb) { - perf_debug("sRGB fast clear not enabled for (%s)", - _mesa_get_format_name(format)); - return false; - } - if (_mesa_is_format_integer_color(format)) { if (devinfo->gen >= 8) { perf_debug("Integer fast clear not enabled for (%s)",