summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2016-05-09 13:13:20 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2016-05-09 11:15:07 +0000
commitf643f6504bf2233c7a5c937be620daf944bb0f61 (patch)
tree267a236166cbb171afb511ef51fa5fa93d16b77a /src/3rdparty
parent09d1554599b285a16e24e5e9f6e15459779e7144 (diff)
Fix ANGLE glGetUniform*v functions to work properly with arrays
glGetUniform*v functions are supposed to return just a single array element, so returning the whole array is always incorrect. Task-number: QTBUG-53072 Change-Id: I22f05d420082d4d9de06d975b3d0f5e64d3e0c41 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/angle/src/libANGLE/Program.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/Program.cpp b/src/3rdparty/angle/src/libANGLE/Program.cpp
index 748ceae030..69497c4436 100644
--- a/src/3rdparty/angle/src/libANGLE/Program.cpp
+++ b/src/3rdparty/angle/src/libANGLE/Program.cpp
@@ -2510,7 +2510,7 @@ void Program::getUniformInternal(GLint location, DestT *dataOut) const
return;
}
- int components = VariableComponentCount(uniform.type) * uniform.elementCount();
+ int components = VariableComponentCount(uniform.type);
switch (componentType)
{