diff options
| author | Matt Turner <mattst88@gmail.com> | 2013-05-20 11:01:37 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2013-06-14 11:25:49 -0700 |
| commit | ed455cdb0be458454fbefb87a1a973d95dda9e6a (patch) | |
| tree | 18b37f9602b81ee84a00aae154d0860fc92fdec6 /src/glsl/hir_field_selection.cpp | |
| parent | a8492e8fe7e70c558a494da7fa2fb4a05dc51962 (diff) | |
| download | external_mesa3d-ed455cdb0be458454fbefb87a1a973d95dda9e6a.zip external_mesa3d-ed455cdb0be458454fbefb87a1a973d95dda9e6a.tar.gz external_mesa3d-ed455cdb0be458454fbefb87a1a973d95dda9e6a.tar.bz2 | |
glsl: Allow swizzles on scalars.
Required by ARB_shading_language_420pack.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl/hir_field_selection.cpp')
| -rw-r--r-- | src/glsl/hir_field_selection.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/glsl/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp index cc7ba61..ceb0a4c 100644 --- a/src/glsl/hir_field_selection.cpp +++ b/src/glsl/hir_field_selection.cpp @@ -96,7 +96,9 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr, } else { _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method); } - } else if (op->type->is_vector()) { + } else if (op->type->is_vector() || + (state->ARB_shading_language_420pack_enable && + op->type->is_scalar())) { ir_swizzle *swiz = ir_swizzle::create(op, expr->primary_expression.identifier, op->type->vector_elements); |