diff options
| -rw-r--r-- | src/compiler/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/compiler/glsl/gl_nir_linker.c | 67 | ||||
| -rw-r--r-- | src/compiler/glsl/gl_nir_linker.h | 3 | ||||
| -rw-r--r-- | src/compiler/glsl/meson.build | 1 |
4 files changed, 72 insertions, 0 deletions
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index 89702a7c5d5..231c5cbfae1 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -30,6 +30,7 @@ LIBGLSL_FILES = \ glsl/gl_nir_lower_samplers_as_deref.c \ glsl/gl_nir_link_uniform_initializers.c \ glsl/gl_nir_link_uniforms.c \ + glsl/gl_nir_linker.c \ glsl/gl_nir_linker.h \ glsl/gl_nir.h \ glsl/glsl_parser_extras.cpp \ diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c new file mode 100644 index 00000000000..d09a2c0a6c5 --- /dev/null +++ b/src/compiler/glsl/gl_nir_linker.c @@ -0,0 +1,67 @@ +/* + * Copyright © 2018 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "nir.h" +#include "gl_nir_linker.h" +#include "linker_util.h" +#include "main/mtypes.h" +#include "ir_uniform.h" /* for gl_uniform_storage */ + +/* This file included general link methods, using NIR, instead of IR as + * the counter-part glsl/linker.cpp + * + * Also note that this is tailored for ARB_gl_spirv needs and particularities + */ + +void +nir_build_program_resource_list(struct gl_context *ctx, + struct gl_shader_program *prog) +{ + /* Rebuild resource list. */ + if (prog->data->ProgramResourceList) { + ralloc_free(prog->data->ProgramResourceList); + prog->data->ProgramResourceList = NULL; + prog->data->NumProgramResourceList = 0; + } + + struct set *resource_set = _mesa_set_create(NULL, + _mesa_hash_pointer, + _mesa_key_pointer_equal); + + /* Add uniforms + * + * Here, it is expected that nir_link_uniforms() has already been + * called, so that UniformStorage table is already available. + */ + for (unsigned i = 0; i < prog->data->NumUniformStorage; i++) { + struct gl_uniform_storage *uniform = &prog->data->UniformStorage[i]; + + if (!link_util_add_program_resource(prog, resource_set, GL_UNIFORM, uniform, + uniform->active_shader_mask)) { + return; + } + } + + + _mesa_set_destroy(resource_set, NULL); +} diff --git a/src/compiler/glsl/gl_nir_linker.h b/src/compiler/glsl/gl_nir_linker.h index 5c650ce0455..9567b9e7b8e 100644 --- a/src/compiler/glsl/gl_nir_linker.h +++ b/src/compiler/glsl/gl_nir_linker.h @@ -37,6 +37,9 @@ bool gl_nir_link_uniforms(struct gl_context *ctx, void gl_nir_set_uniform_initializers(struct gl_context *ctx, struct gl_shader_program *prog); +void nir_build_program_resource_list(struct gl_context *ctx, + struct gl_shader_program *prog); + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index 88a49c6997e..81d0fbea521 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -71,6 +71,7 @@ files_libglsl = files( 'gl_nir_lower_samplers_as_deref.c', 'gl_nir_link_uniform_initializers.c', 'gl_nir_link_uniforms.c', + 'gl_nir_linker.c', 'gl_nir_linker.h', 'gl_nir.h', 'glsl_parser_extras.cpp', |