Module: Mesa
Branch: master
Commit: d0bef79f12aca8d3db323cc49881100be16905fb
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0bef79f12aca8d3db323cc49881100be16905fb
Author: Francisco Jerez <curroje...@riseup.net>
Date: Mon Feb 12 14:23:25 2018 -0800
mesa: Rename dd_function_table::BlendBarrier to match latest EXT spec.
This GL entry point was renamed to glFramebufferFetchBarrier() in the
EXT extension on request from Khronos members. Update the Mesa
codebase to match the latest spec.
Reviewed-by: Plamena Manolova <plamena.manol...@intel.com>
---
src/mesa/drivers/dri/i965/brw_program.c | 4 ++--
src/mesa/main/barrier.c | 2 +-
src/mesa/main/dd.h | 6 +++---
src/mesa/state_tracker/st_cb_texturebarrier.c | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_program.c
b/src/mesa/drivers/dri/i965/brw_program.c
index a513499516..684890e8ba 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -313,7 +313,7 @@ brw_memory_barrier(struct gl_context *ctx, GLbitfield
barriers)
}
static void
-brw_blend_barrier(struct gl_context *ctx)
+brw_framebuffer_fetch_barrier(struct gl_context *ctx)
{
struct brw_context *brw = brw_context(ctx);
const struct gen_device_info *devinfo = &brw->screen->devinfo;
@@ -443,7 +443,7 @@ void brwInitFragProgFuncs( struct dd_function_table
*functions )
functions->LinkShader = brw_link_shader;
functions->MemoryBarrier = brw_memory_barrier;
- functions->BlendBarrier = brw_blend_barrier;
+ functions->FramebufferFetchBarrier = brw_framebuffer_fetch_barrier;
}
struct shader_times {
diff --git a/src/mesa/main/barrier.c b/src/mesa/main/barrier.c
index 5284f28dc0..2c8194e6eb 100644
--- a/src/mesa/main/barrier.c
+++ b/src/mesa/main/barrier.c
@@ -134,5 +134,5 @@ _mesa_BlendBarrier(void)
return;
}
- ctx->Driver.BlendBarrier(ctx);
+ ctx->Driver.FramebufferFetchBarrier(ctx);
}
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 7a39f939c9..3e6a0418a2 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -963,15 +963,15 @@ struct dd_function_table {
/** @} */
/**
- * GL_MESA_shader_framebuffer_fetch_non_coherent rendering barrier.
+ * GL_EXT_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.
+ * EXT_shader_framebuffer_fetch_non_coherent interface.
*/
/** @{ */
- void (*BlendBarrier)(struct gl_context *ctx);
+ void (*FramebufferFetchBarrier)(struct gl_context *ctx);
/** @} */
/**
diff --git a/src/mesa/state_tracker/st_cb_texturebarrier.c
b/src/mesa/state_tracker/st_cb_texturebarrier.c
index 29cd37c16c..2bff03b484 100644
--- a/src/mesa/state_tracker/st_cb_texturebarrier.c
+++ b/src/mesa/state_tracker/st_cb_texturebarrier.c
@@ -55,10 +55,10 @@ st_TextureBarrier(struct gl_context *ctx)
/**
- * Called via ctx->Driver.BlendBarrier()
+ * Called via ctx->Driver.FramebufferFetchBarrier()
*/
static void
-st_BlendBarrier(struct gl_context *ctx)
+st_FramebufferFetchBarrier(struct gl_context *ctx)
{
struct pipe_context *pipe = st_context(ctx)->pipe;
@@ -130,6 +130,6 @@ st_MemoryBarrier(struct gl_context *ctx, GLbitfield
barriers)
void st_init_texture_barrier_functions(struct dd_function_table *functions)
{
functions->TextureBarrier = st_TextureBarrier;
- functions->BlendBarrier = st_BlendBarrier;
+ functions->FramebufferFetchBarrier = st_FramebufferFetchBarrier;
functions->MemoryBarrier = st_MemoryBarrier;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
