[Mesa-dev] [PATCH 34/65] glsl: add shader cache support for buffer blocks

[Timothy Arceri]

---
 src/compiler/glsl/shader_cache.cpp | 152 +++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)

diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp
index f9b2157..747df78 100644
--- a/src/compiler/glsl/shader_cache.cpp
+++ b/src/compiler/glsl/shader_cache.cpp
@@ -187,6 +187,130 @@ read_subroutines(struct blob_reader *metadata, struct gl_shader_program *prog)
 }
 
 static void
+write_buffer_block(struct blob *metadata, struct gl_uniform_block *b)
+{
+   blob_write_string(metadata, b->Name);
+   blob_write_uint32(metadata, b->NumUniforms);
+   blob_write_uint32(metadata, b->Binding);
+   blob_write_uint32(metadata, b->UniformBufferSize);
+   blob_write_uint32(metadata, b->stageref);
+
+   for (unsigned j = 0; j < b->NumUniforms; j++) {
+      blob_write_string(metadata, b->Uniforms[j].Name);
+      blob_write_string(metadata, b->Uniforms[j].IndexName);
+      encode_type_to_blob(metadata, b->Uniforms[j].Type);
+      blob_write_uint32(metadata, b->Uniforms[j].Offset);
+   }
+}
+
+static void
+write_buffer_blocks(struct blob *metadata, struct gl_shader_program *prog)
+{
+   blob_write_uint32(metadata, prog->NumUniformBlocks);
+   blob_write_uint32(metadata, prog->NumShaderStorageBlocks);
+
+   for (unsigned i = 0; i < prog->NumUniformBlocks; i++) {
+      write_buffer_block(metadata, &prog->UniformBlocks[i]);
+   }
+
+   for (unsigned i = 0; i < prog->NumShaderStorageBlocks; i++) {
+      write_buffer_block(metadata, &prog->ShaderStorageBlocks[i]);
+   }
+
+   for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
+      struct gl_shader *sh = prog->_LinkedShaders[i];
+      if (!sh)
+         continue;
+
+      blob_write_uint32(metadata, sh->NumUniformBlocks);
+      blob_write_uint32(metadata, sh->NumShaderStorageBlocks);
+   }
+}
+
+static void
+read_buffer_block(struct blob_reader *metadata, struct gl_uniform_block *b,
+                  struct gl_shader_program *prog)
+{
+      b->Name = ralloc_strdup(prog, blob_read_string (metadata));
+      b->NumUniforms = blob_read_uint32(metadata);
+      b->Binding = blob_read_uint32(metadata);
+      b->UniformBufferSize = blob_read_uint32(metadata);
+      b->stageref = blob_read_uint32(metadata);
+
+      b->Uniforms = rzalloc_array(prog, struct gl_uniform_buffer_variable,
+                                  b->NumUniforms);
+      for (unsigned j = 0; j < b->NumUniforms; j++) {
+         b->Uniforms[j].Name = ralloc_strdup(prog,
+                                             blob_read_string (metadata));
+
+         char *index_name = blob_read_string(metadata);
+         if (strcmp(b->Uniforms[j].Name, index_name) == 0) {
+            b->Uniforms[j].IndexName = b->Uniforms[j].Name;
+         } else {
+            b->Uniforms[j].IndexName = ralloc_strdup(prog, index_name);
+         }
+
+         b->Uniforms[j].Type = decode_type_from_blob(metadata);
+         b->Uniforms[j].Offset = blob_read_uint32(metadata);
+      }
+}
+
+static void
+read_buffer_blocks(struct blob_reader *metadata,
+                   struct gl_shader_program *prog)
+{
+   prog->NumUniformBlocks = blob_read_uint32(metadata);
+   prog->NumShaderStorageBlocks = blob_read_uint32(metadata);
+
+   prog->UniformBlocks = rzalloc_array(prog, struct gl_uniform_block,
+                                       prog->NumUniformBlocks);
+
+   prog->ShaderStorageBlocks = rzalloc_array(prog, struct gl_uniform_block,
+                                             prog->NumShaderStorageBlocks);
+
+   for (unsigned i = 0; i < prog->NumUniformBlocks; i++) {
+      read_buffer_block(metadata, &prog->UniformBlocks[i], prog);
+   }
+
+   for (unsigned i = 0; i < prog->NumShaderStorageBlocks; i++) {
+      read_buffer_block(metadata, &prog->ShaderStorageBlocks[i], prog);
+   }
+
+   for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
+      struct gl_shader *sh = prog->_LinkedShaders[i];
+      if (!sh)
+         continue;
+
+      sh->NumUniformBlocks = blob_read_uint32(metadata);
+      sh->NumShaderStorageBlocks = blob_read_uint32(metadata);
+
+      sh->UniformBlocks =
+         rzalloc_array(prog, gl_uniform_block *, sh->NumUniformBlocks);
+      sh->ShaderStorageBlocks =
+         rzalloc_array(prog, gl_uniform_block *, sh->NumShaderStorageBlocks);
+
+      unsigned ubo_count = 0;
+      for (unsigned j = 0; j < prog->NumUniformBlocks; j++) {
+         if (prog->UniformBlocks[j].stageref & 1 << i) {
+            sh->UniformBlocks[ubo_count] = &prog->UniformBlocks[j];
+            ubo_count++;
+         }
+      }
+      assert(sh->NumUniformBlocks == ubo_count);
+
+      unsigned ssbo_count = 0;
+      for (unsigned j = 0; j < prog->NumShaderStorageBlocks; j++) {
+         if (prog->ShaderStorageBlocks[j].stageref & 1 << i) {
+            sh->ShaderStorageBlocks[ssbo_count] =
+               &prog->ShaderStorageBlocks[j];
+            ssbo_count++;
+         }
+      }
+      assert(sh->NumShaderStorageBlocks == ssbo_count);
+   }
+}
+
+static void
 write_uniforms(struct blob *metadata, struct gl_shader_program *prog)
 {
    uint32_t i;
@@ -452,6 +576,24 @@ write_program_resource_data(struct blob *metadata,
       blob_write_uint32(metadata, data);
       break;
    }
+   case GL_UNIFORM_BLOCK:
+      for (unsigned i = 0; i < prog->NumUniformBlocks; i++) {
+         if (strcmp(((gl_uniform_storage *)res->Data)->name,
+                    prog->UniformBlocks[i].Name) == 0) {
+            blob_write_uint32(metadata, i);
+            break;
+         }
+      }
+      break;
+   case GL_SHADER_STORAGE_BLOCK:
+      for (unsigned i = 0; i < prog->NumShaderStorageBlocks; i++) {
+         if (strcmp(((gl_uniform_storage *)res->Data)->name,
+                    prog->ShaderStorageBlocks[i].Name) == 0) {
+            blob_write_uint32(metadata, i);
+            break;
+         }
+      }
+      break;
    case GL_BUFFER_VARIABLE:
    case GL_VERTEX_SUBROUTINE_UNIFORM:
    case GL_GEOMETRY_SUBROUTINE_UNIFORM:
@@ -515,6 +657,12 @@ read_program_resource_data(struct blob_reader *metadata,
       res->Data = var;
       break;
    }
+   case GL_UNIFORM_BLOCK:
+      res->Data = &prog->UniformBlocks[blob_read_uint32(metadata)];
+      break;
+   case GL_SHADER_STORAGE_BLOCK:
+      res->Data = &prog->ShaderStorageBlocks[blob_read_uint32(metadata)];
+      break;
    case GL_BUFFER_VARIABLE:
    case GL_VERTEX_SUBROUTINE_UNIFORM:
    case GL_GEOMETRY_SUBROUTINE_UNIFORM:
@@ -729,6 +877,8 @@ shader_cache_write_program_metadata(struct gl_context *ctx,
 
    write_uniform_remap_tables(metadata, prog);
 
+   write_buffer_blocks(metadata, prog);
+
    write_subroutines(metadata, prog);
 
    write_program_resource_list(metadata, prog);
@@ -839,6 +989,8 @@ shader_cache_read_program_metadata(struct gl_context *ctx,
 
    read_uniform_remap_tables(&metadata, prog);
 
+   read_buffer_blocks(&metadata, prog);
+
    read_subroutines(&metadata, prog);
 
    read_program_resource_list(&metadata, prog);
-- 
2.5.5