From 0058f00b64268f87a33466646513f7a527beeecc Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Mon, 27 Jun 2011 13:17:52 +0200 Subject: [PATCH] Factor out CGL code for reuse in wayland. --- .../cglconvenience/cglconvenience.mm | 105 +++++++++++++++++++++ .../cglconvenience/cglconvenience.pri | 11 +++ .../cglconvenience/cglconvenience_p.h | 54 +++++++++++ src/platformsupport/platformsupport.pro | 1 + src/plugins/platforms/cocoa/qcocoaglcontext.mm | 25 +---- 5 files changed, 176 insertions(+), 20 deletions(-) create mode 100644 src/platformsupport/cglconvenience/cglconvenience.mm create mode 100644 src/platformsupport/cglconvenience/cglconvenience.pri create mode 100644 src/platformsupport/cglconvenience/cglconvenience_p.h diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm new file mode 100644 index 0000000..43d955e --- /dev/null +++ b/src/platformsupport/cglconvenience/cglconvenience.mm @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** 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 plugins 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 "cglconvenience_p.h" +#include +#include + +void (*qcgl_getProcAddress(const QByteArray &procName))() +{ + CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, + CFSTR("/System/Library/Frameworks/OpenGL.framework"), kCFURLPOSIXPathStyle, false); + CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url); + CFStringRef procNameCF = QCFString::toCFStringRef(QString::fromAscii(procName.constData())); + void *proc = CFBundleGetFunctionPointerForName(bundle, procNameCF); + CFRelease(url); + CFRelease(bundle); + CFRelease(procNameCF); + return (void (*) ())proc; +} + +// Match up with createNSOpenGLPixelFormat below! +QSurfaceFormat qcgl_surfaceFormat() +{ + QSurfaceFormat format; + format.setRedBufferSize(8); + format.setGreenBufferSize(8); + format.setBlueBufferSize(8); + format.setAlphaBufferSize(8); +/* + format.setDepthBufferSize(24); + format.setAccumBufferSize(0); + format.setStencilBufferSize(8); + format.setSampleBuffers(false); + format.setSamples(1); + format.setDepth(true); + format.setRgba(true); + format.setAlpha(true); + format.setAccum(false); + format.setStencil(true); + format.setStereo(false); + format.setDirectRendering(false); +*/ + return format; +} + +void *qcgl_createNSOpenGLPixelFormat() +{ + NSOpenGLPixelFormatAttribute attrs[] = + { + NSOpenGLPFADoubleBuffer, + NSOpenGLPFADepthSize, 32, + 0 + }; + + NSOpenGLPixelFormat* pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]; + return pixelFormat; +} + +CGLContextObj qcgl_createGlContext() +{ + CGLContextObj context; + NSOpenGLPixelFormat *format = reinterpret_cast(qcgl_createNSOpenGLPixelFormat()); + CGLPixelFormatObj cglFormat = static_cast([format CGLPixelFormatObj]); + CGLCreateContext(cglFormat ,NULL, &context); + return context; +} + diff --git a/src/platformsupport/cglconvenience/cglconvenience.pri b/src/platformsupport/cglconvenience/cglconvenience.pri new file mode 100644 index 0000000..fef3b50 --- /dev/null +++ b/src/platformsupport/cglconvenience/cglconvenience.pri @@ -0,0 +1,11 @@ +mac { + INCLUDEPATH += $$PWD + + HEADERS += \ + $$PWD/cglconvenience_p.h + + OBJECTIVE_SOURCES += \ + $$PWD/cglconvenience.mm + + LIBS += -framework Cocoa -framework OpenGl +} diff --git a/src/platformsupport/cglconvenience/cglconvenience_p.h b/src/platformsupport/cglconvenience/cglconvenience_p.h new file mode 100644 index 0000000..f7426b4 --- /dev/null +++ b/src/platformsupport/cglconvenience/cglconvenience_p.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** 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 plugins 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$ +** +****************************************************************************/ + +#ifndef QMACGLCONVENIENCE_H +#define QMACGLCONVENIENCE_H + +#include +#include +#include + +Q_GUI_EXPORT void (*qcgl_getProcAddress(const QByteArray &procName))(); +Q_GUI_EXPORT QSurfaceFormat qcgl_surfaceFormat(); +Q_GUI_EXPORT void *qcgl_createNSOpenGLPixelFormat(); +Q_GUI_EXPORT CGLContextObj qcgl_createGlContext(); + +#endif // QMACGLCONVENIENCE_H diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 0f83a8e..5609996 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -20,6 +20,7 @@ HEADERS += $$PWD/qtplatformsupportversion.h DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h +include(cglconvenience/cglconvenience.pri) include(dnd/dnd.pri) include(eglconvenience/eglconvenience.pri) include(eventdispatchers/eventdispatchers.pri) diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index ba8bd42..c3ff18f 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -2,13 +2,14 @@ #include "qcocoawindow.h" #include #include +#include #import QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformGLContext *share) : m_format(format) { - NSOpenGLPixelFormat *pixelFormat = createNSOpenGLPixelFormat(); + NSOpenGLPixelFormat *pixelFormat = static_cast (qcgl_createNSOpenGLPixelFormat()); NSOpenGLContext *actualShare = share ? static_cast(share)->m_context : 0; m_context = [NSOpenGLContext alloc]; @@ -67,17 +68,9 @@ void QCocoaGLContext::doneCurrent() [NSOpenGLContext clearCurrentContext]; } -void (*QCocoaGLContext::getProcAddress(const QByteArray &procName)) () +void (*QCocoaGLContext::getProcAddress(const QByteArray &procName))() { - CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, - CFSTR("/System/Library/Frameworks/OpenGL.framework"), kCFURLPOSIXPathStyle, false); - CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url); - CFStringRef procNameCF = QCFString::toCFStringRef(QString::fromAscii(procName.constData())); - void *proc = CFBundleGetFunctionPointerForName(bundle, procNameCF); - CFRelease(url); - CFRelease(bundle); - CFRelease(procNameCF); - return (void (*) ())proc; + return qcgl_getProcAddress(procName); } void QCocoaGLContext::update() @@ -87,15 +80,7 @@ void QCocoaGLContext::update() NSOpenGLPixelFormat *QCocoaGLContext::createNSOpenGLPixelFormat() { - NSOpenGLPixelFormatAttribute attrs[] = - { - NSOpenGLPFADoubleBuffer, - NSOpenGLPFADepthSize, 32, - 0 - }; - - NSOpenGLPixelFormat* pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]; - return pixelFormat; + return static_cast(qcgl_createNSOpenGLPixelFormat()); } NSOpenGLContext *QCocoaGLContext::nsOpenGLContext() const -- 2.7.4