diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-11 08:04:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-11 08:04:06 +0100 |
| commit | c4583f59d8460f05ee211c2f8ed6208addfe3087 (patch) | |
| tree | 59420aaa7f249fcf3766adfab41e5285d48048e8 /mesalib/src/glsl | |
| parent | 71ff3367cab660035c6ea38e5171841dacd461b5 (diff) | |
| parent | 8753441b3ba4316448e1ae5f408e6a84b0116a3c (diff) | |
| download | vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.gz vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.tar.bz2 vcxsrv-c4583f59d8460f05ee211c2f8ed6208addfe3087.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 11 Feb 2013
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/glsl_types.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp index 4a2c87907..3b066d099 100644 --- a/mesalib/src/glsl/glsl_types.cpp +++ b/mesalib/src/glsl/glsl_types.cpp @@ -81,6 +81,7 @@ glsl_type::glsl_type(GLenum gl_type, glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, const char *name) : + gl_type(0), base_type(GLSL_TYPE_STRUCT), sampler_dimensionality(0), sampler_shadow(0), sampler_array(0), sampler_type(0), interface_packing(0), @@ -103,6 +104,7 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, enum glsl_interface_packing packing, const char *name) : + gl_type(0), base_type(GLSL_TYPE_INTERFACE), sampler_dimensionality(0), sampler_shadow(0), sampler_array(0), sampler_type(0), interface_packing((unsigned) packing), |