From d610fbc13e589b36ce8f1e1af7166d215f0ccc90 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Tue, 30 Aug 2011 10:41:54 +0200 Subject: Cocoa: Make the hellowindow opengl example work. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit You're not supposed to use NSOpenGLView and NSOpenGLContext at the same time - it's one or the other. Qmlscene worked because it was hitting the raster path that doesn't have a NSOpenGLView. Remove the NSOpenGLView path and m_windowSurfaceView. Change-Id: I10358851a94cd1780a312af09bbb7cf5db8f984f Reviewed-on: http://codereview.qt.nokia.com/3862 Reviewed-by: Qt Sanity Bot Reviewed-by: Gunnar Sletta Reviewed-by: Samuel Rødal --- src/plugins/platforms/cocoa/qcocoabackingstore.mm | 4 ++-- src/plugins/platforms/cocoa/qcocoaglcontext.mm | 4 +++- src/plugins/platforms/cocoa/qcocoawindow.h | 2 -- src/plugins/platforms/cocoa/qcocoawindow.mm | 15 --------------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm index 1a25608a7a..5a59fb5c49 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm @@ -84,7 +84,7 @@ void QCocoaBackingStore::flush(QWindow *widget, const QRegion ®ion, const QPo QRect geo = region.boundingRect(); NSRect rect = NSMakeRect(geo.x(), geo.y(), geo.width(), geo.height()); - [m_cocoaWindow->m_windowSurfaceView displayRect:rect]; + [m_cocoaWindow->m_contentView displayRect:rect]; } void QCocoaBackingStore::resize(const QSize &size, const QRegion &) @@ -92,7 +92,7 @@ void QCocoaBackingStore::resize(const QSize &size, const QRegion &) delete m_image; m_image = new QImage(size,QImage::Format_ARGB32_Premultiplied); NSSize newSize = NSMakeSize(size.width(),size.height()); - [static_cast(m_cocoaWindow->m_windowSurfaceView) setImage:m_image]; + [static_cast(m_cocoaWindow->m_contentView) setImage:m_image]; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index fabed4e207..8b07315378 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -39,6 +39,8 @@ void QCocoaGLContext::swapBuffers(QPlatformSurface *surface) bool QCocoaGLContext::makeCurrent(QPlatformSurface *surface) { + QCocoaAutoReleasePool pool; + QWindow *window = static_cast(surface)->window(); setActiveWindow(window); @@ -61,7 +63,7 @@ void QCocoaGLContext::setActiveWindow(QWindow *window) QCocoaWindow *cocoaWindow = static_cast(window->handle()); cocoaWindow->setCurrentContext(this); - NSView *view = cocoaWindow->windowSurfaceView(); + NSView *view = cocoaWindow->contentView(); [m_context setView:view]; } diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 035a09b607..ce79d3967f 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -72,7 +72,6 @@ public: WId winId() const; NSView *contentView() const; - NSView *windowSurfaceView() const; void windowDidMove(); void windowDidResize(); @@ -92,7 +91,6 @@ private: friend class QCocoaBackingStore; QNSWindow *m_nsWindow; QNSView *m_contentView; - NSView *m_windowSurfaceView; quint32 m_windowAttributes; quint32 m_windowClass; QCocoaGLContext *m_glContext; diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index b7d7bd83bc..78785a8527 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -90,16 +90,6 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw) m_contentView = [[QNSView alloc] initWithQWindow:tlw]; - if (tlw->surfaceType() == QWindow::OpenGLSurface) { - NSRect glFrame = globalGeometry(window()->geometry()); - m_windowSurfaceView = [[NSOpenGLView alloc] initWithFrame : glFrame pixelFormat : QCocoaGLContext::createNSOpenGLPixelFormat() ]; - [m_contentView setAutoresizesSubviews : YES]; - [m_windowSurfaceView setAutoresizingMask : (NSViewWidthSizable | NSViewHeightSizable)]; - [m_contentView addSubview : m_windowSurfaceView]; - } else { - m_windowSurfaceView = m_contentView; - } - setGeometry(tlw->geometry()); [m_nsWindow setContentView:m_contentView]; @@ -166,11 +156,6 @@ NSView *QCocoaWindow::contentView() const return [m_nsWindow contentView]; } -NSView *QCocoaWindow::windowSurfaceView() const -{ - return m_windowSurfaceView; -} - void QCocoaWindow::windowDidMove() { if (m_glContext) -- cgit v1.2.3