diff options
| author | Ilia Mirkin <[email protected]> | 2016-01-10 22:39:16 -0500 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2016-01-29 21:05:47 -0500 |
| commit | 6fb8fac853b09416b7462e61f00233844319a505 (patch) | |
| tree | 1b14832d1cc93e9d7a02e15fad2f5711c9111350 | |
| parent | 792bab24ac33f6614d549cfaca219a3855908e0d (diff) | |
st/mesa: add shader buffer barrier bit
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texturebarrier.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index b46187bc8a1..335f4e6a262 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -352,6 +352,7 @@ enum pipe_flush_flags * Flags for pipe_context::memory_barrier. */ #define PIPE_BARRIER_MAPPED_BUFFER (1 << 0) +#define PIPE_BARRIER_SHADER_BUFFER (1 << 1) /** * Resource binding flags -- state tracker must specify in advance all diff --git a/src/mesa/state_tracker/st_cb_texturebarrier.c b/src/mesa/state_tracker/st_cb_texturebarrier.c index dd4dde74c86..6f6176b9fe5 100644 --- a/src/mesa/state_tracker/st_cb_texturebarrier.c +++ b/src/mesa/state_tracker/st_cb_texturebarrier.c @@ -65,6 +65,10 @@ st_MemoryBarrier(struct gl_context *ctx, GLbitfield barriers) if (barriers & GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT) flags |= PIPE_BARRIER_MAPPED_BUFFER; + if (barriers & GL_ATOMIC_COUNTER_BARRIER_BIT) + flags |= PIPE_BARRIER_SHADER_BUFFER; + if (barriers & GL_SHADER_STORAGE_BARRIER_BIT) + flags |= PIPE_BARRIER_SHADER_BUFFER; if (flags && pipe->memory_barrier) pipe->memory_barrier(pipe, flags); |