diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-28 07:58:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-28 07:58:44 +0100 |
| commit | 39b49babc915183f4d712053b46f0e010427c191 (patch) | |
| tree | b512cf3f17a0defe9e2cd6ababdc9f5337f93d0e /mesalib/src/glsl/link_uniform_initializers.cpp | |
| parent | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (diff) | |
| parent | 69c8cec54b01ed522bf10baf20da70304bac701a (diff) | |
| download | vcxsrv-39b49babc915183f4d712053b46f0e010427c191.tar.gz vcxsrv-39b49babc915183f4d712053b46f0e010427c191.tar.bz2 vcxsrv-39b49babc915183f4d712053b46f0e010427c191.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa mkfontscale pixman git update 28 jan 2013
Diffstat (limited to 'mesalib/src/glsl/link_uniform_initializers.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_uniform_initializers.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/glsl/link_uniform_initializers.cpp b/mesalib/src/glsl/link_uniform_initializers.cpp index 849e08097..836a360fa 100644 --- a/mesalib/src/glsl/link_uniform_initializers.cpp +++ b/mesalib/src/glsl/link_uniform_initializers.cpp @@ -67,7 +67,11 @@ copy_constant_to_storage(union gl_constant_value *storage, case GLSL_TYPE_BOOL: storage[i].b = int(val->value.b[i]); break; - default: + case GLSL_TYPE_ARRAY: + case GLSL_TYPE_STRUCT: + case GLSL_TYPE_INTERFACE: + case GLSL_TYPE_VOID: + case GLSL_TYPE_ERROR: /* All other types should have already been filtered by other * paths in the caller. */ |