summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qcocoaglcontext.h
diff options
context:
space:
mode:
authorTeemu Katajisto <teemu.katajisto@digia.com>2012-02-23 16:50:29 +0200
committerQt by Nokia <qt-info@nokia.com>2012-02-25 11:43:35 +0100
commite430ddfafcc6e8fa9fecb9c816908c3edce08d77 (patch)
tree082a9d2f4ec28dcebdf3507555cdfbb633d1eca8 /src/plugins/platforms/cocoa/qcocoaglcontext.h
parent6ee0135e9d43bfd56d948d088781dc014ef39aa1 (diff)
Implement isSharing() and isValid() methods for QCocoaGLContext
Shared resources may have been used when initializing NSOpenGLContext but QCocoaGLContext did not implement isSharing(). This caused default implementation to return false always and therefore shared resource test case failed. Implemented also another missing method, isValid(). Task-number: QTBUG-23061 Change-Id: Ia912450035b584ea90a02a7d88d6ae531c3cbadf Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaglcontext.h')
-rw-r--r--src/plugins/platforms/cocoa/qcocoaglcontext.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h
index b8582022f6..4f80511f61 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@@ -71,10 +71,14 @@ public:
static NSOpenGLPixelFormat *createNSOpenGLPixelFormat(const QSurfaceFormat &format);
NSOpenGLContext *nsOpenGLContext() const;
+ bool isSharing() const;
+ bool isValid() const;
+
private:
void setActiveWindow(QWindow *window);
NSOpenGLContext *m_context;
+ NSOpenGLContext *m_shareContext;
QSurfaceFormat m_format;
QWeakPointer<QWindow> m_currentWindow;
};