aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-07 10:45:44 +0100
committermarha <marha@users.sourceforge.net>2013-02-07 10:45:44 +0100
commitcbcf519f983c24f5d315b4abc194e5d147dc0ab7 (patch)
tree3f9cafad0ae5ba278eb444c4ec85f53155e7050d /mesalib/src/glsl
parent012567f7279756f1fcc4aee30e5e72f0938fe3da (diff)
parent956c20498738c242726b5a42ed28db8572a90bed (diff)
downloadvcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.gz
vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.bz2
vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa fontconfig git update 7 Feb 2013
Diffstat (limited to 'mesalib/src/glsl')
-rw-r--r--mesalib/src/glsl/ast.h12
-rw-r--r--mesalib/src/glsl/glsl_parser_extras.cpp4
2 files changed, 10 insertions, 6 deletions
diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h
index 713ad174f..f920759d6 100644
--- a/mesalib/src/glsl/ast.h
+++ b/mesalib/src/glsl/ast.h
@@ -551,11 +551,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,