From: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Fri, 23 Mar 2018 11:35:48 +0000 (+0100)
Subject: nir/linker: add ubo/ssbo to the program resource list
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=691cee751a93aa100594a8fcede0869047d86674;p=mesa.git

nir/linker: add ubo/ssbo to the program resource list

v2: "nir/linker: Use the stageref when adding UBO/SSBO resources"
     squashed on this one (Timothy)

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
---

diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index 92e90714e10..49ba9501f7a 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -65,5 +65,19 @@ nir_build_program_resource_list(struct gl_context *ctx,
    }
 
 
+   for (unsigned i = 0; i < prog->data->NumUniformBlocks; i++) {
+      if (!link_util_add_program_resource(prog, resource_set, GL_UNIFORM_BLOCK,
+                                          &prog->data->UniformBlocks[i],
+                                          prog->data->UniformBlocks[i].stageref))
+         return;
+   }
+
+   for (unsigned i = 0; i < prog->data->NumShaderStorageBlocks; i++) {
+      if (!link_util_add_program_resource(prog, resource_set, GL_SHADER_STORAGE_BLOCK,
+                                          &prog->data->ShaderStorageBlocks[i],
+                                          prog->data->ShaderStorageBlocks[i].stageref))
+         return;
+   }
+
    _mesa_set_destroy(resource_set, NULL);
 }