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

glsl: add support for caching atomic buffers

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri
2016-03-26 13:37:30 +11:00
committed by Timothy Arceri
parent 3d15d814c0
commit a3ff840d05
1 changed files with 89 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/compiler/glsl/shader_cache.cpp
View File

@@ -404,6 +404,79 @@ read_buffer_blocks(struct blob_reader *metadata,
}
}
static void
write_atomic_buffers(struct blob *metadata, struct gl_shader_program *prog)
{
blob_write_uint32(metadata, prog->data->NumAtomicBuffers);
for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
if (prog->_LinkedShaders[i]) {
struct gl_program *glprog = prog->_LinkedShaders[i]->Program;
blob_write_uint32(metadata, glprog->info.num_abos);
}
}
for (unsigned i = 0; i < prog->data->NumAtomicBuffers; i++) {
blob_write_uint32(metadata, prog->data->AtomicBuffers[i].Binding);
blob_write_uint32(metadata, prog->data->AtomicBuffers[i].MinimumSize);
blob_write_uint32(metadata, prog->data->AtomicBuffers[i].NumUniforms);
blob_write_bytes(metadata, prog->data->AtomicBuffers[i].StageReferences,
sizeof(prog->data->AtomicBuffers[i].StageReferences));
for (unsigned j = 0; j < prog->data->AtomicBuffers[i].NumUniforms; j++) {
blob_write_uint32(metadata, prog->data->AtomicBuffers[i].Uniforms[j]);
}
}
}
static void
read_atomic_buffers(struct blob_reader *metadata,
struct gl_shader_program *prog)
{
prog->data->NumAtomicBuffers = blob_read_uint32(metadata);
prog->data->AtomicBuffers =
rzalloc_array(prog, gl_active_atomic_buffer,
prog->data->NumAtomicBuffers);
struct gl_active_atomic_buffer **stage_buff_list[MESA_SHADER_STAGES];
for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
if (prog->_LinkedShaders[i]) {
struct gl_program *glprog = prog->_LinkedShaders[i]->Program;
glprog->info.num_abos = blob_read_uint32(metadata);
glprog->sh.AtomicBuffers =
rzalloc_array(glprog, gl_active_atomic_buffer *,
glprog->info.num_abos);
stage_buff_list[i] = glprog->sh.AtomicBuffers;
}
}
for (unsigned i = 0; i < prog->data->NumAtomicBuffers; i++) {
prog->data->AtomicBuffers[i].Binding = blob_read_uint32(metadata);
prog->data->AtomicBuffers[i].MinimumSize = blob_read_uint32(metadata);
prog->data->AtomicBuffers[i].NumUniforms = blob_read_uint32(metadata);
blob_copy_bytes(metadata,
(uint8_t *) &prog->data->AtomicBuffers[i].StageReferences,
sizeof(prog->data->AtomicBuffers[i].StageReferences));
prog->data->AtomicBuffers[i].Uniforms = rzalloc_array(prog, unsigned,
prog->data->AtomicBuffers[i].NumUniforms);
for (unsigned j = 0; j < prog->data->AtomicBuffers[i].NumUniforms; j++) {
prog->data->AtomicBuffers[i].Uniforms[j] = blob_read_uint32(metadata);
}
for (unsigned j = 0; j < MESA_SHADER_STAGES; j++) {
if (prog->data->AtomicBuffers[i].StageReferences[j]) {
*stage_buff_list[j] = &prog->data->AtomicBuffers[i];
stage_buff_list[j]++;
}
}
}
}
static void
write_xfb(struct blob *metadata, struct gl_shader_program *shProg)
{
@@ -805,6 +878,15 @@ write_program_resource_data(struct blob *metadata,
}
}
break;
case GL_ATOMIC_COUNTER_BUFFER:
for (unsigned i = 0; i < prog->data->NumAtomicBuffers; i++) {
if (((gl_active_atomic_buffer *)res->Data)->Binding ==
prog->data->AtomicBuffers[i].Binding) {
blob_write_uint32(metadata, i);
break;
}
}
break;
case GL_TRANSFORM_FEEDBACK_BUFFER:
for (unsigned i = 0; i < MAX_FEEDBACK_BUFFERS; i++) {
if (((gl_transform_feedback_buffer *)res->Data)->Binding ==
@@ -880,6 +962,9 @@ read_program_resource_data(struct blob_reader *metadata,
case GL_UNIFORM:
res->Data = &prog->data->UniformStorage[blob_read_uint32(metadata)];
break;
case GL_ATOMIC_COUNTER_BUFFER:
res->Data = &prog->data->AtomicBuffers[blob_read_uint32(metadata)];
break;
case GL_TRANSFORM_FEEDBACK_BUFFER:
res->Data = &prog->last_vert_prog->
sh.LinkedTransformFeedback->Buffers[blob_read_uint32(metadata)];
@@ -1115,6 +1200,8 @@ shader_cache_write_program_metadata(struct gl_context *ctx,
write_uniform_remap_tables(metadata, prog);
write_atomic_buffers(metadata, prog);
write_buffer_blocks(metadata, prog);
write_subroutines(metadata, prog);
@@ -1226,6 +1313,8 @@ shader_cache_read_program_metadata(struct gl_context *ctx,
read_uniform_remap_tables(&metadata, prog);
read_atomic_buffers(&metadata, prog);
read_buffer_blocks(&metadata, prog);
read_subroutines(&metadata, prog);