1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Track QPlatformGLContext API changes

Browse Source
This commit is contained in:
Paul Olav Tvete 2011-05-03 14:11:45 +02:00
parent 3745e1bd79
commit 86f20c89af
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
View File

@ -97,8 +97,6 @@ QWaylandReadbackEglContext::~QWaylandReadbackEglContext()
void QWaylandReadbackEglContext::makeCurrent() void QWaylandReadbackEglContext::makeCurrent()
{ {
QPlatformGLContext::makeCurrent();
mWindow->waitForFrameSync(); mWindow->waitForFrameSync();
eglMakeCurrent(mEglIntegration->eglDisplay(),mPixmapSurface,mPixmapSurface,mContext); eglMakeCurrent(mEglIntegration->eglDisplay(),mPixmapSurface,mPixmapSurface,mContext);
@ -114,7 +112,7 @@ void QWaylandReadbackEglContext::swapBuffers()
{ {
eglSwapBuffers(mEglIntegration->eglDisplay(),mPixmapSurface); eglSwapBuffers(mEglIntegration->eglDisplay(),mPixmapSurface);
if (QPlatformGLContext::currentContext() != this) { if (QWindowContext::currentContext().handle() != this) {
makeCurrent(); makeCurrent();
} }

4
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
View File

@ -85,8 +85,6 @@ QWaylandReadbackGlxContext::QWaylandReadbackGlxContext(QWaylandReadbackGlxIntegr
void QWaylandReadbackGlxContext::makeCurrent() void QWaylandReadbackGlxContext::makeCurrent()
{ {
QPlatformGLContext::makeCurrent();
glXMakeCurrent(mGlxIntegration->xDisplay(),mGlxPixmap,mContext); glXMakeCurrent(mGlxIntegration->xDisplay(),mGlxPixmap,mContext);
} }
@ -97,7 +95,7 @@ void QWaylandReadbackGlxContext::doneCurrent()
void QWaylandReadbackGlxContext::swapBuffers() void QWaylandReadbackGlxContext::swapBuffers()
{ {
if (QPlatformGLContext::currentContext() != this) { if (QWindowContext::currentContext().handle() != this) {
makeCurrent(); makeCurrent();
} }

1
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
View File

@ -90,7 +90,6 @@ QWaylandGLContext::~QWaylandGLContext()
void QWaylandGLContext::makeCurrent() void QWaylandGLContext::makeCurrent()
{ {
QPlatformGLContext::makeCurrent();
if (mSurface == EGL_NO_SURFACE) { if (mSurface == EGL_NO_SURFACE) {
qWarning("makeCurrent with EGL_NO_SURFACE"); qWarning("makeCurrent with EGL_NO_SURFACE");
} }

2
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
View File

@ -75,8 +75,6 @@ QWaylandXCompositeEGLContext::QWaylandXCompositeEGLContext(QWaylandXCompositeEGL
void QWaylandXCompositeEGLContext::makeCurrent() void QWaylandXCompositeEGLContext::makeCurrent()
{ {
QPlatformGLContext::makeCurrent();
eglMakeCurrent(mEglIntegration->eglDisplay(),mEglWindowSurface,mEglWindowSurface,mContext); eglMakeCurrent(mEglIntegration->eglDisplay(),mEglWindowSurface,mEglWindowSurface,mContext);
} }

1
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
View File

@ -67,7 +67,6 @@ QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(QWaylandXCompositeGLX
void QWaylandXCompositeGLXContext::makeCurrent() void QWaylandXCompositeGLXContext::makeCurrent()
{ {
QPlatformGLContext::makeCurrent();
glXMakeCurrent(mGlxIntegration->xDisplay(),mXWindow,mContext); glXMakeCurrent(mGlxIntegration->xDisplay(),mXWindow,mContext);
} }