diff options
| author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-05-19 07:57:40 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-05-19 09:50:42 +0000 |
| commit | 3967e2779ccb602f28d35322498ed7b07ae5c93f (patch) | |
| tree | d5575c44b8c0e644914175cbf894922319aa8feb | |
| parent | f7ef80130852d1889502f0a3fe07c1c0bf71be75 (diff) | |
Return the correct type in getShaderParameter
Change-Id: I7fb0374b284204da17c3547d7062e6680af5c024
Task-number: QTBUG-46188
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
| -rw-r--r-- | src/imports/qtcanvas3d/context3d.cpp | 8 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/context3d_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp index 56e9412..388e95c 100644 --- a/src/imports/qtcanvas3d/context3d.cpp +++ b/src/imports/qtcanvas3d/context3d.cpp @@ -3580,7 +3580,7 @@ void CanvasContext::vertexAttrib4fv(unsigned int indx, QJSValue array) /*! * \internal */ -int CanvasContext::getShaderParameter(QJSValue shader3D, glEnums pname) +QJSValue CanvasContext::getShaderParameter(QJSValue shader3D, glEnums pname) { qCDebug(canvas3drendering).nospace() << "Context3D::" << __FUNCTION__ << "(shader:" << shader3D.toString() @@ -3601,17 +3601,17 @@ int CanvasContext::getShaderParameter(QJSValue shader3D, glEnums pname) GLint shaderType = 0; glGetShaderiv( shader->qOGLShader()->shaderId(), GL_SHADER_TYPE, &shaderType); logAllGLErrors(__FUNCTION__); - return shaderType; + return QJSValue(shaderType); } case DELETE_STATUS: { bool isDeleted = !shader->isAlive(); qCDebug(canvas3drendering).nospace() << " getShaderParameter returns " << isDeleted; - return (isDeleted ? GL_TRUE : GL_FALSE); + return (isDeleted ? QJSValue(bool(GL_TRUE)) : QJSValue(bool(GL_FALSE))); } case COMPILE_STATUS: { bool isCompiled = shader->qOGLShader()->isCompiled(); qCDebug(canvas3drendering).nospace() << " getShaderParameter returns " << isCompiled; - return (isCompiled ? GL_TRUE : GL_FALSE); + return (isCompiled ? QJSValue(bool(GL_TRUE)) : QJSValue(bool(GL_FALSE))); } default: { qCWarning(canvas3drendering).nospace() << "getShaderParameter():UNSUPPORTED parameter name " diff --git a/src/imports/qtcanvas3d/context3d_p.h b/src/imports/qtcanvas3d/context3d_p.h index 72c8750..b4b0021 100644 --- a/src/imports/qtcanvas3d/context3d_p.h +++ b/src/imports/qtcanvas3d/context3d_p.h @@ -1102,7 +1102,7 @@ public: Q_INVOKABLE void vertexAttrib3fv(unsigned int indx, QJSValue array); Q_INVOKABLE void vertexAttrib4fv(unsigned int indx, QJSValue array); - Q_INVOKABLE int getShaderParameter(QJSValue shader3D, glEnums paramName); + Q_INVOKABLE QJSValue getShaderParameter(QJSValue shader3D, glEnums paramName); Q_INVOKABLE QVariant getProgramParameter(QJSValue program, glEnums paramName); Q_INVOKABLE QJSValue getShaderInfoLog(QJSValue shader3D); |