summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2017-09-12 19:44:37 +0200
committerJesus Fernandez <Jesus.Fernandez@qt.io>2017-09-20 08:02:41 +0000
commit572fc94b52f9fe48ba1deb6816219aff8ebf3866 (patch)
tree36f393feda2be5a64e1df379723bf6ae77c4c91c
parent399379962002306c7281c3a5c318965335595e8a (diff)
Fix rsize and rname in glGetActiveUniform function
The rsize and rname variable were assigned to the rtype instead of rsize and rname. Change-Id: Iceab3c6062ccd86c5bb7131b55fc4c31084dff78 Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r--src/plugins/platforms/webgl/qwebglcontext.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/webgl/qwebglcontext.cpp b/src/plugins/platforms/webgl/qwebglcontext.cpp
index e3c25bf..151693d 100644
--- a/src/plugins/platforms/webgl/qwebglcontext.cpp
+++ b/src/plugins/platforms/webgl/qwebglcontext.cpp
@@ -905,8 +905,8 @@ static void glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GL
QCoreApplication::postEvent(QWebGLIntegrationPrivate::instance()->webSocketServer, event);
const auto values = queryValue(id).toMap();
int rtype = values["rtype"].toInt();
- int rsize = values["rtype"].toInt();
- QByteArray rname = values["rtype"].toByteArray();
+ const auto rsize = values["rsize"].toInt();
+ const auto rname = values["rname"].toByteArray();
if (type)
*type = rtype;
if (size)