Module: Mesa Branch: master Commit: ed455cdb0be458454fbefb87a1a973d95dda9e6a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed455cdb0be458454fbefb87a1a973d95dda9e6a
Author: Matt Turner <[email protected]> Date: Mon May 20 11:01:37 2013 -0700 glsl: Allow swizzles on scalars. Required by ARB_shading_language_420pack. Reviewed-by: Kenneth Graunke <[email protected]> --- 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
