From 956c20498738c242726b5a42ed28db8572a90bed Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 7 Feb 2013 10:17:56 +0100
Subject: mesa fontconfig git update 7 Feb 2013
fontconfig commit 96220a5ed9d1d761b14a7ac516ac6786c132f280
mesa commit 9ba1e23647c09290c98cc7133fb73dd1df1da8ab
---
mesalib/src/glsl/ast.h | 12 ++++++++----
mesalib/src/glsl/glsl_parser_extras.cpp | 4 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
(limited to 'mesalib/src/glsl')
diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h
index 1a28963c4..fcc6b4566 100644
--- a/mesalib/src/glsl/ast.h
+++ b/mesalib/src/glsl/ast.h
@@ -547,11 +547,15 @@ public:
class ast_parameter_declarator : public ast_node {
public:
- ast_parameter_declarator()
+ ast_parameter_declarator() :
+ type(NULL),
+ identifier(NULL),
+ is_array(false),
+ array_size(NULL),
+ formal_parameter(false),
+ is_void(false)
{
- this->identifier = NULL;
- this->is_array = false;
- this->array_size = 0;
+ /* empty */
}
virtual void print(void) const;
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index c8dbc89ff..7d826e3a6 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -1195,8 +1195,8 @@ ast_struct_specifier::ast_struct_specifier(const char *identifier,
* The setting of this flag only matters if
* \c linked is \c true.
* \param max_unroll_iterations Maximum number of loop iterations to be
- * unrolled. Setting to 0 forces all loops
- * to be unrolled.
+ * unrolled. Setting to 0 disables loop
+ * unrolling.
*/
bool
do_common_optimization(exec_list *ir, bool linked,
--
cgit v1.2.3