From 303fb5881c36b8c1270f3c8071705eea336c341b Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 5 Jul 2016 23:21:21 -0700
Subject: [PATCH] mesa: Add blend barrier entry point and driver hook.

Both MESA_shader_framebuffer_fetch_non_coherent and the non-coherent
variant of KHR_blend_equation_advanced will use this driver hook to
request coherency between framebuffer reads and writes.  This
intentionally doesn't hook up glBlendBarrierMESA to the dispatch layer
since the extension isn't exposed to applications yet, see [1]
for more details.

[1] https://lists.freedesktop.org/archives/mesa-dev/2016-July/124028.html

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/mesa/main/barrier.c | 14 ++++++++++++++
 src/mesa/main/barrier.h |  3 +++
 src/mesa/main/dd.h      | 12 ++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/mesa/main/barrier.c b/src/mesa/main/barrier.c
index 7ae8fc6b0aa..42a5e0f9203 100644
--- a/src/mesa/main/barrier.c
+++ b/src/mesa/main/barrier.c
@@ -108,3 +108,17 @@ _mesa_MemoryBarrierByRegion(GLbitfield barriers)
       ctx->Driver.MemoryBarrier(ctx, barriers);
    }
 }
+
+void GLAPIENTRY
+_mesa_BlendBarrierMESA(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx->Extensions.MESA_shader_framebuffer_fetch_non_coherent) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glBlendBarrier(not supported)");
+      return;
+   }
+
+   ctx->Driver.BlendBarrier(ctx);
+}
diff --git a/src/mesa/main/barrier.h b/src/mesa/main/barrier.h
index 8eee583c7ff..21dce90d074 100644
--- a/src/mesa/main/barrier.h
+++ b/src/mesa/main/barrier.h
@@ -47,4 +47,7 @@ _mesa_MemoryBarrier(GLbitfield barriers);
 void GLAPIENTRY
 _mesa_MemoryBarrierByRegion(GLbitfield barriers);
 
+void GLAPIENTRY
+_mesa_BlendBarrierMESA(void);
+
 #endif /* BARRIER_H */
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index a3dc191b444..257dc103817 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -957,6 +957,18 @@ struct dd_function_table {
    void (*MemoryBarrier)(struct gl_context *ctx, GLbitfield barriers);
    /** @} */
 
+   /**
+    * GL_MESA_shader_framebuffer_fetch_non_coherent rendering barrier.
+    *
+    * On return from this function any framebuffer contents written by
+    * previous draw commands are guaranteed to be visible from subsequent
+    * fragment shader invocations using the
+    * MESA_shader_framebuffer_fetch_non_coherent interface.
+    */
+   /** @{ */
+   void (*BlendBarrier)(struct gl_context *ctx);
+   /** @} */
+
    /**
     * \name GL_ARB_compute_shader interface
     */
-- 
2.30.2