diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
| commit | 04f3d1515878e535b7e3876264eaa4d43a1e6d54 (patch) | |
| tree | 58867d9fa0097be91f1717a693a7ca4b3eb77d71 /mesalib/src/glsl/glsl_types.cpp | |
| parent | ff986553659472cf191804eadb13c21e8f2b44c0 (diff) | |
| parent | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (diff) | |
| download | vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.gz vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.bz2 vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver git update 29 July 2013
Diffstat (limited to 'mesalib/src/glsl/glsl_types.cpp')
| -rw-r--r-- | mesalib/src/glsl/glsl_types.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp index 9d3691b54..8324b8ade 100644 --- a/mesalib/src/glsl/glsl_types.cpp +++ b/mesalib/src/glsl/glsl_types.cpp @@ -281,7 +281,7 @@ glsl_type::glsl_type(const glsl_type *array, unsigned length) : } -const glsl_type *const +const glsl_type * glsl_type::vec(unsigned components) { if (components == 0 || components > 4) @@ -294,7 +294,7 @@ glsl_type::vec(unsigned components) } -const glsl_type *const +const glsl_type * glsl_type::ivec(unsigned components) { if (components == 0 || components > 4) @@ -307,7 +307,7 @@ glsl_type::ivec(unsigned components) } -const glsl_type *const +const glsl_type * glsl_type::uvec(unsigned components) { if (components == 0 || components > 4) @@ -320,7 +320,7 @@ glsl_type::uvec(unsigned components) } -const glsl_type *const +const glsl_type * glsl_type::bvec(unsigned components) { if (components == 0 || components > 4) |