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/mesa/program | |
| 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/mesa/program')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 011ffed7bb4..e5844c3c437 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2432,8 +2432,7 @@ add_uniform_to_shader::visit_field(const glsl_type *type, const char *name, } gl_register_file file; - if (type->is_sampler() || - (type->is_array() && type->fields.array->is_sampler())) { + if (type->without_array()->is_sampler()) { file = PROGRAM_SAMPLER; } else { file = PROGRAM_UNIFORM; |