diff options
| author | Timothy Arceri <[email protected]> | 2014-08-19 13:56:42 -1000 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-08-19 17:44:06 -0700 |
| commit | a1853eaea7fa5caf59b52567cc49f964ce5293ec (patch) | |
| tree | 5e361a2ee5d6369c7fdcf7c202f52ea63a51ddf8 /src/glsl | |
| parent | e6a53533b7aa790f66b044f77deaac450aa39fde (diff) | |
glsl: Use the without_array predicate in some more places
Reviewed-by: Matt Turner <[email protected]>
Signed-off-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/link_uniform_initializers.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp index a745c7cace3..f6a60bce993 100644 --- a/src/glsl/link_uniform_initializers.cpp +++ b/src/glsl/link_uniform_initializers.cpp @@ -259,8 +259,7 @@ link_set_uniform_initializers(struct gl_shader_program *prog, if (var->data.explicit_binding) { const glsl_type *const type = var->type; - if (type->is_sampler() - || (type->is_array() && type->fields.array->is_sampler())) { + if (type->without_array()->is_sampler()) { linker::set_sampler_binding(prog, var->name, var->data.binding); } else if (var->is_in_uniform_block()) { const glsl_type *const iface_type = var->get_interface_type(); |