diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
| commit | 1de316b38f589817344e1a342050de4c427501df (patch) | |
| tree | de3ec426a2a640a021b17ea55da8d71a07a8a412 /mesalib/src/glsl | |
| parent | 41665774749bc54dcd635ebbaab045a4350d5b2f (diff) | |
| parent | a7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff) | |
| download | vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.gz vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.bz2 vcxsrv-1de316b38f589817344e1a342050de4c427501df.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 11 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/builtin_functions.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp index 5d8f171b9..ce78df12e 100644 --- a/mesalib/src/glsl/builtin_functions.cpp +++ b/mesalib/src/glsl/builtin_functions.cpp @@ -525,6 +525,9 @@ private: * @{ */ builtin_builder::builtin_builder() + : shader(NULL), + gl_ModelViewProjectionMatrix(NULL), + gl_Vertex(NULL) { mem_ctx = NULL; } @@ -1850,6 +1853,7 @@ builtin_builder::add_function(const char *name, ...) f->add_signature(sig); } + va_end(ap); shader->symbols->add_function(f); } |