AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: link buffer variables and shader storage buffer interface blocks

Browse Source 
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Kristian Høgsberg
2015-05-13 11:17:23 +02:00
committed by Samuel Iglesias Gonsalvez
parent 84fc5fece0
commit a78a589efc
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/linker.cpp
+2 -2
View File
@@ -777,7 +777,7 @@ cross_validate_globals(struct gl_shader_program *prog,
if (var == NULL)
continue;
if (uniforms_only && (var->data.mode != ir_var_uniform))
if (uniforms_only && (var->data.mode != ir_var_uniform && var->data.mode != ir_var_shader_storage))
continue;
/* Don't cross validate temporaries that are at global scope. These
@@ -2574,7 +2574,7 @@ check_explicit_uniform_locations(struct gl_context *ctx,
foreach_in_list(ir_instruction, node, sh->ir) {
ir_variable *var = node->as_variable();
if ((var && var->data.mode == ir_var_uniform) &&
if (var && (var->data.mode == ir_var_uniform || var->data.mode == ir_var_shader_storage) &&
var->data.explicit_location) {
if (!reserve_explicit_locations(prog, uniform_map, var)) {
delete uniform_map;