From 954b02af4f2e5d3c8a1fc39966fe16eafb26be90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Niemel=C3=A4?= Date: Fri, 13 May 2011 13:18:32 +0300 Subject: Some code cleanup --- src/glfunctions.h | 150 ++++++++++----------- src/shadereffect.cpp | 4 +- src/shadereffectsource.cpp | 2 +- .../manual/performance/GaussianDirectionalBlur.qml | 10 +- tests/manual/performance/sydney5.png | Bin 174118 -> 0 bytes tests/manual/performance/tile.jpg | Bin 6494 -> 0 bytes .../qml/qmlshadersplugintest/back.svg | 22 +-- .../qml/qmlshadersplugintest/main.qml | 2 +- .../qmlapplicationviewer/qmlapplicationviewer.pri | 2 +- 9 files changed, 93 insertions(+), 99 deletions(-) delete mode 100644 tests/manual/performance/sydney5.png delete mode 100644 tests/manual/performance/tile.jpg diff --git a/src/glfunctions.h b/src/glfunctions.h index 5c8d8a6..03b88d1 100755 --- a/src/glfunctions.h +++ b/src/glfunctions.h @@ -1,75 +1,75 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QML Shaders plugin of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef GLFUNCTIONS_H -#define GLFUNCTIONS_H - -#ifndef QT_OPENGL_ES - -#ifndef Q_WS_MAC -# ifndef QGLF_APIENTRYP -# ifdef QGLF_APIENTRY -# define QGLF_APIENTRYP QGLF_APIENTRY * -# else -# define QGLF_APIENTRY -# define QGLF_APIENTRYP * -# endif -# endif -#else -# define QGLF_APIENTRY -# define QGLF_APIENTRYP * -#endif - -#define GL_TEXTURE0 0x84C0 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_BGRA 0x80E1 - -typedef void (QGLF_APIENTRYP type_glActiveTexture)(GLenum texture); -typedef void (QGLF_APIENTRYP type_glGenerateMipmap)(GLenum target); -typedef void (QGLF_APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); - -#define glActiveTexture ((type_glActiveTexture)QGLContext::currentContext()->getProcAddress(QLatin1String("glActiveTexture"))) -#define glGenerateMipmap ((type_glGenerateMipmap)QGLContext::currentContext()->getProcAddress(QLatin1String("glGenerateMipmap"))) -#define glVertexAttribPointer ((type_glVertexAttribPointer)QGLContext::currentContext()->getProcAddress(QLatin1String("glVertexAttribPointer"))) - -#endif - -#endif // GLFUNCTIONS_H +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QML Shaders plugin of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef GLFUNCTIONS_H +#define GLFUNCTIONS_H + +#ifndef QT_OPENGL_ES + +#ifndef Q_WS_MAC +# ifndef QGLF_APIENTRYP +# ifdef QGLF_APIENTRY +# define QGLF_APIENTRYP QGLF_APIENTRY * +# else +# define QGLF_APIENTRY +# define QGLF_APIENTRYP * +# endif +# endif +#else +# define QGLF_APIENTRY +# define QGLF_APIENTRYP * +#endif + +#define GL_TEXTURE0 0x84C0 +#define GL_CLAMP_TO_EDGE 0x812F +#define GL_BGRA 0x80E1 + +typedef void (QGLF_APIENTRYP type_glActiveTexture)(GLenum texture); +typedef void (QGLF_APIENTRYP type_glGenerateMipmap)(GLenum target); +typedef void (QGLF_APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); + +#define glActiveTexture ((type_glActiveTexture)QGLContext::currentContext()->getProcAddress(QLatin1String("glActiveTexture"))) +#define glGenerateMipmap ((type_glGenerateMipmap)QGLContext::currentContext()->getProcAddress(QLatin1String("glGenerateMipmap"))) +#define glVertexAttribPointer ((type_glVertexAttribPointer)QGLContext::currentContext()->getProcAddress(QLatin1String("glVertexAttribPointer"))) + +#endif + +#endif // GLFUNCTIONS_H diff --git a/src/shadereffect.cpp b/src/shadereffect.cpp index a76c1c6..bbea43c 100644 --- a/src/shadereffect.cpp +++ b/src/shadereffect.cpp @@ -50,7 +50,7 @@ static QTransform savedWorldTransform; ShaderEffect::ShaderEffect(QObject *parent) - : QGraphicsEffect(parent) + : QGraphicsEffect(parent) , m_changed(true) { } @@ -74,7 +74,7 @@ void ShaderEffect::prepareBufferedDraw(QPainter *painter) void ShaderEffect::draw (QPainter *painter) { - const QGLContext *context = QGLContext::currentContext(); + const QGLContext *context = QGLContext::currentContext(); prepareBufferedDraw(painter); diff --git a/src/shadereffectsource.cpp b/src/shadereffectsource.cpp index 41e8011..0a133bd 100644 --- a/src/shadereffectsource.cpp +++ b/src/shadereffectsource.cpp @@ -336,7 +336,7 @@ void ShaderEffectSource::bind() const } void ShaderEffectSource::refFromEffectItem() -{ +{ if (m_refs++ == 0) { attachSourceItem(); emit activeChanged(); diff --git a/tests/manual/performance/GaussianDirectionalBlur.qml b/tests/manual/performance/GaussianDirectionalBlur.qml index de46a66..33f576b 100644 --- a/tests/manual/performance/GaussianDirectionalBlur.qml +++ b/tests/manual/performance/GaussianDirectionalBlur.qml @@ -41,7 +41,6 @@ ShaderEffectItem { for (var i = 0; i < effect.samples; i++) { step = -effect.samples/2 + i + 0.5 n[i] = gausFunc(step); - //console.log("New gaussian value " + step + ": " + n[i]); } return n; } @@ -113,26 +112,21 @@ ShaderEffectItem { onDeviationChanged:{ effect.startIndex = -effect.samples/2 + 0.5 effect.gwts = calcGWTS(); -// console.log(" deviation changed") var sum = 0.0; - for(var j = 0; j < effect.samples; j++){ + for (var j = 0; j < effect.samples; j++) { sum += effect.gwts[j]; } effect.gaussianSum = sum -// console.log("Gaussian values ready, sum = " + sum + ", startIndex = " + effect.startIndex); -// console.log("Gaussian values ready, deviation = " + effect.deviation) } Component.onCompleted:{ effect.startIndex = -effect.samples/2 + 0.5 effect.gwts = calcGWTS(); var sum = 0.0; - for(var j = 0; j < effect.samples; j++){ + for (var j = 0; j < effect.samples; j++) { sum += effect.gwts[j]; } effect.gaussianSum = sum -// console.log("Gaussian values ready, sum = " + sum + ", startIndex = " + effect.startIndex); -// console.log("Gaussian values ready, deviation = " + effect.deviation) buildFragmentShader() } diff --git a/tests/manual/performance/sydney5.png b/tests/manual/performance/sydney5.png deleted file mode 100644 index 300a6fd..0000000 Binary files a/tests/manual/performance/sydney5.png and /dev/null differ diff --git a/tests/manual/performance/tile.jpg b/tests/manual/performance/tile.jpg deleted file mode 100644 index 4aeebe5..0000000 Binary files a/tests/manual/performance/tile.jpg and /dev/null differ diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/back.svg b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/back.svg index 31a78be..3005133 100755 --- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/back.svg +++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/back.svg @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml index de5807d..2a857a9 100644 --- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml +++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml @@ -64,7 +64,7 @@ Item { } ListModel { - id: testcaseModel + id: testcaseModel ListElement { name: "TestEffectHierarchy.qml"; group: "Effect source property tests" } ListElement { name: "TestGrab.qml"; group: "Effect source property tests" } ListElement { name: "TestLive.qml"; group: "Effect source property tests" } diff --git a/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.pri index 471b9cd..79e6a9f 100644 --- a/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.pri @@ -98,7 +98,7 @@ symbian { } else:unix { maemo5 { installPrefix = /opt/usr - desktopfile.path = /usr/share/applications/hildon + desktopfile.path = /usr/share/applications/hildon } else { installPrefix = /usr/local desktopfile.path = /usr/share/applications -- cgit v1.2.3