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

mesa: Make atomic lowering put atomics above SSBOs.

Browse Source 
Gallium arbitrarily (it seems) put atomics below SSBOs, resulting in a
bunch of extra index management, and surprising shader code when you would
see your SSBOs up at index 16.  It makes a lot more sense to see atomics
converted to SSBOs appear as magic high numbers.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3240>
This commit is contained in:
Eric Anholt
2019-12-20 09:02:07 -08:00
parent 2dc2055157
commit 10dc4ac4c5
8 changed files with 48 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,13 +66,19 @@ st_binding_to_sb(struct gl_buffer_binding *binding,
static void
st_bind_atomics(struct st_context *st, struct gl_program *prog,
enum pipe_shader_type shader_type)
gl_shader_stage stage)
{
unsigned i;
enum pipe_shader_type shader_type = pipe_shader_type_from_mesa(stage);
if (!prog || !st->pipe->set_shader_buffers || st->has_hw_atomics)
return;
/* For !has_hw_atomics, the atomic counters have been rewritten to be above
* the SSBO range.
*/
unsigned buffer_base = st->ctx->Const.Program[stage].MaxShaderStorageBlocks;
for (i = 0; i < prog->sh.data->NumAtomicBuffers; i++) {
struct gl_active_atomic_buffer *atomic =
&prog->sh.data->AtomicBuffers[i];
@@ -81,7 +87,7 @@ st_bind_atomics(struct st_context *st, struct gl_program *prog,
st_binding_to_sb(&st->ctx->AtomicBufferBindings[atomic->Binding], &sb);
st->pipe->set_shader_buffers(st->pipe, shader_type,
atomic->Binding, 1, &sb, 0x1);
buffer_base + atomic->Binding, 1, &sb, 0x1);
}
}
@@ -91,7 +97,7 @@ st_bind_vs_atomics(struct st_context *st)
struct gl_program *prog =
st->ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
st_bind_atomics(st, prog, PIPE_SHADER_VERTEX);
st_bind_atomics(st, prog, MESA_SHADER_VERTEX);
}
void
@@ -100,7 +106,7 @@ st_bind_fs_atomics(struct st_context *st)
struct gl_program *prog =
st->ctx->_Shader->CurrentProgram[MESA_SHADER_FRAGMENT];
st_bind_atomics(st, prog, PIPE_SHADER_FRAGMENT);
st_bind_atomics(st, prog, MESA_SHADER_FRAGMENT);
}
void
@@ -109,7 +115,7 @@ st_bind_gs_atomics(struct st_context *st)
struct gl_program *prog =
st->ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY];
st_bind_atomics(st, prog, PIPE_SHADER_GEOMETRY);
st_bind_atomics(st, prog, MESA_SHADER_GEOMETRY);
}
void
@@ -118,7 +124,7 @@ st_bind_tcs_atomics(struct st_context *st)
struct gl_program *prog =
st->ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_CTRL];
st_bind_atomics(st, prog, PIPE_SHADER_TESS_CTRL);
st_bind_atomics(st, prog, MESA_SHADER_TESS_CTRL);
}
void
@@ -127,7 +133,7 @@ st_bind_tes_atomics(struct st_context *st)
struct gl_program *prog =
st->ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_EVAL];
st_bind_atomics(st, prog, PIPE_SHADER_TESS_EVAL);
st_bind_atomics(st, prog, MESA_SHADER_TESS_EVAL);
}
void
@@ -140,7 +146,7 @@ st_bind_cs_atomics(struct st_context *st)
struct gl_program *prog =
st->ctx->_Shader->CurrentProgram[MESA_SHADER_COMPUTE];
st_bind_atomics(st, prog, PIPE_SHADER_COMPUTE);
st_bind_atomics(st, prog, MESA_SHADER_COMPUTE);
}
void