diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/opengl/util/meego | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/opengl/util/meego')
-rw-r--r-- | src/opengl/util/meego/main.cpp | 89 | ||||
-rw-r--r-- | src/opengl/util/meego/shader-cache-introspector.pro | 7 |
2 files changed, 0 insertions, 96 deletions
diff --git a/src/opengl/util/meego/main.cpp b/src/opengl/util/meego/main.cpp deleted file mode 100644 index 21ac5fd629..0000000000 --- a/src/opengl/util/meego/main.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** 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 QtOpenGL module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtCore/qdebug.h> - -#define QT_DEBUG_SHADER_CACHE -#define QT_MEEGO_EXPERIMENTAL_SHADERCACHE -#define QT_OPENGL_ES_2 -#define QT_BOOTSTRAPPED - -typedef int GLsizei; -typedef unsigned int GLenum; - -#include "../../gl2paintengineex/qglshadercache_meego_p.h" - -#include <stdlib.h> -#include <stdio.h> - -int main() -{ - ShaderCacheSharedMemory shm; - - if (!shm.isAttached()) { - fprintf(stderr, "Unable to attach to shared memory\n"); - return EXIT_FAILURE; - } - - ShaderCacheLocker locker(&shm); - if (!locker.isLocked()) { - fprintf(stderr, "Unable to lock shared memory\n"); - return EXIT_FAILURE; - } - - void *data = shm.data(); - Q_ASSERT(data); - - CachedShaders *cache = reinterpret_cast<CachedShaders *>(data); - - for (int i = 0; i < cache->shaderCount; ++i) { - printf("Shader %d: %d bytes\n", i, cache->headers[i].size); - } - - printf("\nSummary:\n\n" - " Amount of cached shaders: %d\n" - " Bytes used: %d\n" - " Bytes available: %d\n", - cache->shaderCount, cache->dataSize, cache->availableSize()); - - return EXIT_SUCCESS; -} - diff --git a/src/opengl/util/meego/shader-cache-introspector.pro b/src/opengl/util/meego/shader-cache-introspector.pro deleted file mode 100644 index 520e9a5108..0000000000 --- a/src/opengl/util/meego/shader-cache-introspector.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = app - -SOURCES += main.cpp - -TARGET = shader-cache-introspector - -QT = core |