fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 00:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Rename dd_function_table::BlendBarrier to match latest EXT spec.

Browse source 
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.manolova@intel.com>
This commit is contained in:
Francisco Jerez 2018-02-12 14:23:25 -08:00
parent 27c829da28
commit d0bef79f12
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_program.c
View file

@ -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 {

2
src/mesa/main/barrier.c
View file

@ -134,5 +134,5 @@ _mesa_BlendBarrier(void)
return;
}
ctx->Driver.BlendBarrier(ctx);
ctx->Driver.FramebufferFetchBarrier(ctx);
}

6
src/mesa/main/dd.h
View file

@ -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);
/** @} */
/**

6
src/mesa/state_tracker/st_cb_texturebarrier.c
View file

@ -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;
}