diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2015-11-24 12:40:53 +0100 |
|---|---|---|
| committer | Iago Toral Quiroga <itoral@igalia.com> | 2015-11-25 08:09:17 +0100 |
| commit | 1af0d9d93910de2e482a7891a16ddfd6d6b0855c (patch) | |
| tree | 5d4d3c9d6eaa992de26609a9b39b6b6f56ad9041 | |
| parent | f1b7fefd4e7e3872cc0d43901b7ec643e1d115f9 (diff) | |
| download | external_mesa3d-1af0d9d93910de2e482a7891a16ddfd6d6b0855c.zip external_mesa3d-1af0d9d93910de2e482a7891a16ddfd6d6b0855c.tar.gz external_mesa3d-1af0d9d93910de2e482a7891a16ddfd6d6b0855c.tar.bz2 | |
glsl: remove trailing spaces in various files
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 6 | ||||
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 4 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 3 | ||||
| -rw-r--r-- | src/glsl/ir_reader.cpp | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 81cde73..8fcda63 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -1824,7 +1824,7 @@ ast_expression::do_hir(exec_list *instructions, * tree. This particular use must be at location specified in the grammar * as 'variable_identifier'. */ - ir_variable *var = + ir_variable *var = state->symbols->get_variable(this->primary_expression.identifier); if (var != NULL) { @@ -5557,8 +5557,8 @@ ast_switch_statement::hir(exec_list *instructions, /* From page 66 (page 55 of the PDF) of the GLSL 1.50 spec: * - * "The type of init-expression in a switch statement must be a - * scalar integer." + * "The type of init-expression in a switch statement must be a + * scalar integer." */ if (!test_expression->type->is_scalar() || !test_expression->type->is_integer()) { diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 881ee2b..c5489b7 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -1336,7 +1336,7 @@ builtin_builder::create_builtins() _smoothstep(fp64, glsl_type::dvec3_type, glsl_type::dvec3_type), _smoothstep(fp64, glsl_type::dvec4_type, glsl_type::dvec4_type), NULL); - + FD130(isnan) FD130(isinf) @@ -1373,7 +1373,7 @@ builtin_builder::create_builtins() FD(distance) FD(dot) - add_function("cross", _cross(always_available, glsl_type::vec3_type), + add_function("cross", _cross(always_available, glsl_type::vec3_type), _cross(fp64, glsl_type::dvec3_type), NULL); FD(normalize) diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 7da4aba..7138925 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -1086,7 +1086,7 @@ void ast_compound_statement::print(void) const { printf("{\n"); - + foreach_list_typed(ast_node, ast, link, &this->statements) { ast->print(); } @@ -1412,7 +1412,6 @@ ast_selection_statement::print(void) const printf("else "); else_statement->print(); } - } diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp index 07720e2..7c0af1b 100644 --- a/src/glsl/ir_reader.cpp +++ b/src/glsl/ir_reader.cpp @@ -93,7 +93,7 @@ ir_reader::read(exec_list *instructions, const char *src, bool scan_for_protos) ir_read_error(NULL, "couldn't parse S-Expression."); return; } - + if (scan_for_protos) { scan_for_prototypes(instructions, expr); if (state->error) @@ -147,7 +147,7 @@ ir_reader::read_type(s_expression *expr) return glsl_type::get_array_instance(base_type, s_size->value()); } - + s_symbol *type_sym = SX_AS_SYMBOL(expr); if (type_sym == NULL) { ir_read_error(expr, "expected <type>"); |