From 691cee751a93aa100594a8fcede0869047d86674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= Date: Fri, 23 Mar 2018 12:35:48 +0100 Subject: [PATCH] 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 Reviewed-by: Caio Marcelo de Oliveira Filho --- src/compiler/glsl/gl_nir_linker.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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); }