OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: start adding support for hw atomics atom. (v2)

Browse Source 
This adds a new atom that calls the new driver API to
bind buffers containing hw atomics.

v2: fixup bindings for sparse buffers. (mareko/nha)
don't bind buffer atomics when hw atomics are enabled.
use NewAtomicBuffer (mareko)

Tested-By: Gert Wollny <gw.fossdev@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2017-11-01 14:30:13 +10:00
parent e0fb6de313
commit 9f1db21f28
5 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/mesa/state_tracker/st_atom_atomicbuf.c
View File

@@ -46,7 +46,7 @@ st_bind_atomics(struct st_context *st, struct gl_program *prog,
{
unsigned i;
if (!prog || !st->pipe->set_shader_buffers)
if (!prog || !st->pipe->set_shader_buffers || st->has_hw_atomics)
return;
for (i = 0; i < prog->sh.data->NumAtomicBuffers; i++) {
@@ -63,7 +63,7 @@ st_bind_atomics(struct st_context *st, struct gl_program *prog,
sb.buffer_offset = binding->Offset;
sb.buffer_size = st_obj->buffer->width0 - binding->Offset;
/* AutomaticSize is FALSE if the buffer was set with BindBufferRange.
/* AutomaticSize is FALSE if the buffer was set with BindBufferRange.
* Take the minimum just to be sure.
*/
if (!binding->AutomaticSize)
@@ -128,3 +128,37 @@ st_bind_cs_atomics(struct st_context *st)
st_bind_atomics(st, prog, PIPE_SHADER_COMPUTE);
}
void
st_bind_hw_atomic_buffers(struct st_context *st)
{
struct pipe_shader_buffer buffers[PIPE_MAX_HW_ATOMIC_BUFFERS];
int i;
if (!st->has_hw_atomics)
return;
for (i = 0; i < st->ctx->Const.MaxAtomicBufferBindings; i++) {
struct gl_buffer_binding *binding = &st->ctx->AtomicBufferBindings[i];
struct st_buffer_object *st_obj = st_buffer_object(binding->BufferObject);
struct pipe_shader_buffer *sb = &buffers[i];
if (st_obj && st_obj->buffer) {
sb->buffer = st_obj->buffer;
sb->buffer_offset = binding->Offset;
sb->buffer_size = st_obj->buffer->width0 - binding->Offset;
/* AutomaticSize is FALSE if the buffer was set with BindBufferRange.
* Take the minimum just to be sure.
*/
if (!binding->AutomaticSize)
sb->buffer_size = MIN2(sb->buffer_size, (unsigned) binding->Size);
} else {
sb->buffer = NULL;
sb->buffer_offset = 0;
sb->buffer_size = 0;
}
}
st->pipe->set_hw_atomic_buffers(st->pipe, 0, st->ctx->Const.MaxAtomicBufferBindings, buffers);
}