diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-18 14:38:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-18 14:38:14 +0200 |
| commit | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (patch) | |
| tree | 04d45a3c638e7397354fcd1df02d969c8ece058f /mesalib/src/glsl/link_uniforms.cpp | |
| parent | ae06feae7876db47ff0e1fde40cf4a324a412037 (diff) | |
| download | vcxsrv-55cf29d7f748b814a2b8eb016fbf15635d56aa53.tar.gz vcxsrv-55cf29d7f748b814a2b8eb016fbf15635d56aa53.tar.bz2 vcxsrv-55cf29d7f748b814a2b8eb016fbf15635d56aa53.zip | |
plink fontconfig mesa xserver xkeyboard-config git update 18 May 2014
xserver commit 01e18af17f8dc91451fbd0902049045afd1cea7e
xkeyboard-config commit 2bf80b0d9b36fd56acf1f196fb781f045351efaf
fontconfig commit 58acd993cb13b58c61633174071ef42da3dcac85
mesa commit 5646319f25c7880b3706bb7590e24c84fd8de0fc
plink revision 10192
Diffstat (limited to 'mesalib/src/glsl/link_uniforms.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_uniforms.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index 29dc0b196..c7147e0ee 100644 --- a/mesalib/src/glsl/link_uniforms.cpp +++ b/mesalib/src/glsl/link_uniforms.cpp @@ -308,8 +308,7 @@ private: */ const unsigned values = values_for_type(type); if (type->contains_sampler()) { - this->num_shader_samplers += - type->is_array() ? type->array_size() : 1; + this->num_shader_samplers += values; } else if (type->contains_image()) { this->num_shader_images += values; |