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

glsl: pass the ir_variable object to set_opaque_binding()

Browse Source 
In order to set the explicit binding value for bindless
samplers/images.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Samuel Pitoiset
2017-05-10 15:41:25 +02:00
parent 3a087dd7a4
commit e3c6fba5d6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/glsl/link_uniform_initializers.cpp
View File

@@ -97,7 +97,8 @@ copy_constant_to_storage(union gl_constant_value *storage,
*/ */
void void
set_opaque_binding(void *mem_ctx, gl_shader_program *prog, set_opaque_binding(void *mem_ctx, gl_shader_program *prog,
const glsl_type *type, const char *name, int *binding) const ir_variable *var, const glsl_type *type,
const char *name, int *binding)
{ {
if (type->is_array() && type->fields.array->is_array()) { if (type->is_array() && type->fields.array->is_array()) {
@@ -106,7 +107,7 @@ set_opaque_binding(void *mem_ctx, gl_shader_program *prog,
for (unsigned int i = 0; i < type->length; i++) { for (unsigned int i = 0; i < type->length; i++) {
const char *element_name = ralloc_asprintf(mem_ctx, "%s[%d]", name, i); const char *element_name = ralloc_asprintf(mem_ctx, "%s[%d]", name, i);
set_opaque_binding(mem_ctx, prog, element_type, set_opaque_binding(mem_ctx, prog, var, element_type,
element_name, binding); element_name, binding);
} }
} else { } else {
@@ -281,7 +282,7 @@ link_set_uniform_initializers(struct gl_shader_program *prog,
if (type->without_array()->is_sampler() || if (type->without_array()->is_sampler() ||
type->without_array()->is_image()) { type->without_array()->is_image()) {
int binding = var->data.binding; int binding = var->data.binding;
linker::set_opaque_binding(mem_ctx, prog, var->type, linker::set_opaque_binding(mem_ctx, prog, var, var->type,
var->name, &binding); var->name, &binding);
} else if (var->is_in_buffer_block()) { } else if (var->is_in_buffer_block()) {
const glsl_type *const iface_type = var->get_interface_type(); const glsl_type *const iface_type = var->get_interface_type();