<html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> </head> <body bgcolor="#FFFFFF" text="#000000"> Ok, thanks for the pointers. Will take a look tomorrow (is 21:00 here). Btw, what do you prefer? To fix it first on the texture barrier with a patch like this, and then import Vulkan's? or forget about fixing with the current status and go directly to import Vulkan's approach? BR <div class="moz-cite-prefix">On 30/06/16 16:04, Jason Ekstrand wrote: </div> <blockquote cite="mid:CAOFGe95w8EVwgDqvK3Npfrf2a2jb+3o_FLsPZb81Dfg=zJxzHQ@mail.gmail.com" type="cite"> Fwiw, I very much like the way I did this in the Vulkan driver where it splits it into two pipe controls automatically based on the input bits. (Look at genX_cmd_buffer.c cmd_buffer_apply_pipe_flushes.) I very much doubt that this is the only place we have this problem in the GL driver. We should probably fix it in brw_emit_pipe_control. <div class="gmail_quote">On Jun 30, 2016 12:00 AM, "Alejandro Piñeiro" <<a moz-do-not-send="true" href="mailto:apinheiro@igalia.com">apinheiro@igalia.com</a>> wrote: <blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <div class="quoted-text">Fixes: GL44-CTS.texture_barrier_ARB.same-texel-rw-multipass On Haswell, Broadwell and Skylake (note that in order to execute that test, it is needed to override GL and GLSL versions). On gen6 this test was already working without this change. It keeps working after it. This commit replaces the call to brw_emit_mi_flush for gen6+ with two calls to brw_emit_pipe_control_flush: * The first one with RENDER_TARGET_FLUSH and CS_STALL set to initiate a render cache flush after any concurrent rendering completes and cause the CS to stop parsing commands until the render cache becomes coherent with memory. * The second one have TEXTURE_CACHE_INVALIDATE set (and no CS stall) to clean up any stale data from the sampler caches before rendering continues. Didn't touch gen4-5, basically because I don't have a way to test them. More info on commits: 0aa4f99f562a05880a779707cbcd46be459863bf 72473658c51d5e074ce219c1e6385a4cce29f467 Thanks to Curro to help to tracking this down, as the root case was a hw race condition. </div> v2: use two calls to pipe_control_flush instead of a combination of gen7_emit_cs_stall_flush and brw_emit_mi_flush calls (Curro) v3: no need to const cache invalidation (Curro) --- FWIW: checked with the CTS tests, and the piglit series, and confirmed that the const cache invalidation is not needed. src/mesa/drivers/dri/i965/intel_tex.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c index cac33ac..a802d5a 100644 <div class="quoted-text">--- a/src/mesa/drivers/dri/i965/intel_tex.c +++ b/src/mesa/drivers/dri/i965/intel_tex.c @@ -9,6 +9,7 @@ #include "intel_mipmap_tree.h" #include "intel_tex.h" #include "intel_fbo.h" +#include "intel_reg.h" #define FILE_DEBUG_FLAG DEBUG_TEXTURE </div> @@ -362,7 +363,25 @@ intel_texture_barrier(struct gl_context *ctx) <div class="quoted-text"> { struct brw_context *brw = brw_context(ctx); - brw_emit_mi_flush(brw); + if (brw->gen >= 6) { + if (brw->gen == 6) { + /* [Dev-SNB{W/A}]: Before a PIPE_CONTROL with Write Cache + * Flush Enable = 1, a PIPE_CONTROL with any non-zero + * post-sync-op is required. + */ + brw_emit_post_sync_nonzero_flush(brw); + } + + brw_emit_pipe_control_flush(brw, + PIPE_CONTROL_DEPTH_CACHE_FLUSH | + PIPE_CONTROL_RENDER_TARGET_FLUSH | + PIPE_CONTROL_CS_STALL); + + brw_emit_pipe_control_flush(brw, </div> + PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE); <div class="quoted-text">+ } else { + brw_emit_mi_flush(brw); + } } void -- 2.7.4 </div> <div class="elided-text">_______________________________________________ mesa-dev mailing list <a moz-do-not-send="true" href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a moz-do-not-send="true" href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </div> </blockquote> </div> </blockquote> </body> </html>