summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIago Toral Quiroga <[email protected]>2015-11-24 12:40:53 +0100
committerIago Toral Quiroga <[email protected]>2015-11-25 08:09:17 +0100
commit1af0d9d93910de2e482a7891a16ddfd6d6b0855c (patch)
tree5d4d3c9d6eaa992de26609a9b39b6b6f56ad9041 /src
parentf1b7fefd4e7e3872cc0d43901b7ec643e1d115f9 (diff)
glsl: remove trailing spaces in various files
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/glsl/ast_to_hir.cpp6
-rw-r--r--src/glsl/builtin_functions.cpp4
-rw-r--r--src/glsl/glsl_parser_extras.cpp3
-rw-r--r--src/glsl/ir_reader.cpp4
4 files changed, 8 insertions, 9 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 81cde73798a..8fcda63d95e 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 881ee2b6b55..c5489b7314a 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 7da4aba6b3d..71389252743 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 07720e28749..7c0af1b712f 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>");