diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-03-07 13:11:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-10 21:04:16 +0100 |
| commit | 5aaec4800066801f069dfb4606c5d9551a9b8110 (patch) | |
| tree | 8ba5faacb6ab34531153bb1f3ccf4414e9c3ca80 /src/platformsupport | |
| parent | 4084e7dc19a4140efa4cb7956d10a5c738c455b5 (diff) | |
Remove unused parameter from QEGLPlatformContext constructor
The API is chosen via QSurfaceFormat, the constructor argument is ignored.
Remove this historical artifact.
Change-Id: I4a5c1e12cb297de22f239ad0a6747c1c36168eed
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/platformsupport')
3 files changed, 4 insertions, 11 deletions
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp index 630c77fba0..e1c53196e6 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -89,8 +89,7 @@ static inline void bindApi(const QSurfaceFormat &format) } } -QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, - EGLenum eglApi) +QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display) : m_eglDisplay(display) , m_eglConfig(q_configFromGLFormat(display, format)) , m_swapInterval(-1) @@ -98,11 +97,10 @@ QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatform , m_swapIntervalFromEnv(-1) { init(format, share); - Q_UNUSED(eglApi); } QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, - EGLConfig config, EGLenum eglApi) + EGLConfig config) : m_eglDisplay(display) , m_eglConfig(config) , m_swapInterval(-1) @@ -110,7 +108,6 @@ QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatform , m_swapIntervalFromEnv(-1) { init(format, share); - Q_UNUSED(eglApi); } void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLContext *share) diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h index d62082faa2..b4734fb22a 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h +++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h @@ -51,10 +51,9 @@ QT_BEGIN_NAMESPACE class QEGLPlatformContext : public QPlatformOpenGLContext { public: + QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display); QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, - EGLenum eglApi = EGL_OPENGL_ES_API); - QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, - EGLConfig config, EGLenum eglApi = EGL_OPENGL_ES_API); + EGLConfig config); ~QEGLPlatformContext(); bool makeCurrent(QPlatformSurface *surface); diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration.cpp b/src/platformsupport/eglconvenience/qeglplatformintegration.cpp index a961035e22..b48f993436 100644 --- a/src/platformsupport/eglconvenience/qeglplatformintegration.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformintegration.cpp @@ -106,9 +106,6 @@ QEGLPlatformIntegration::~QEGLPlatformIntegration() void QEGLPlatformIntegration::initialize() { - if (!eglBindAPI(EGL_OPENGL_ES_API)) - qFatal("Could not bind GL_ES API"); - m_display = eglGetDisplay(nativeDisplay()); if (m_display == EGL_NO_DISPLAY) qFatal("Could not open egl display"); |