From b33d9e5e9a140b08e9ca24bdfb2dc4973357674c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 27 Oct 2016 06:33:26 +0000 Subject: [PATCH] do not add stubs for EGL Signed-off-by: Ivailo Monev --- src/gui/egl/egl.cmake | 6 - src/gui/egl/qegl_stub.cpp | 303 ------------------------------------ src/gui/egl/qeglproperties_stub.cpp | 143 ----------------- 3 files changed, 452 deletions(-) delete mode 100644 src/gui/egl/qegl_stub.cpp delete mode 100644 src/gui/egl/qeglproperties_stub.cpp diff --git a/src/gui/egl/egl.cmake b/src/gui/egl/egl.cmake index 4ce78164a..edf957f10 100644 --- a/src/gui/egl/egl.cmake +++ b/src/gui/egl/egl.cmake @@ -16,11 +16,5 @@ if(WITH_EGL AND EGL_FOUND) ${EGL_LIBRARIES} ) include_directories(${EGL_INCLUDES}) -else() - set(GUI_SOURCES - ${GUI_SOURCES} - ${CMAKE_CURRENT_SOURCE_DIR}/egl/qegl_stub.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/egl/qeglproperties_stub.cpp - ) endif() diff --git a/src/gui/egl/qegl_stub.cpp b/src/gui/egl/qegl_stub.cpp deleted file mode 100644 index 7aff15f96..000000000 --- a/src/gui/egl/qegl_stub.cpp +++ /dev/null @@ -1,303 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company 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. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include - -#include "qegl_p.h" -#include "qeglcontext_p.h" - - -QT_BEGIN_NAMESPACE - -static void noegl(const char *fn) -{ - qWarning() << fn << " called, but Qt configured without EGL" << endl; -} - -#define NOEGL noegl(__FUNCTION__); - -QEglContext::QEglContext() - : apiType(QEgl::OpenGL) - , ctx(0) - , cfg(QEGL_NO_CONFIG) - , currentSurface(0) - , current(false) - , ownsContext(true) - , sharing(false) -{ - NOEGL -} - -QEglContext::~QEglContext() -{ - NOEGL -} - -bool QEglContext::isValid() const -{ - NOEGL - return false; -} - -bool QEglContext::isCurrent() const -{ - NOEGL - return false; -} - -EGLConfig QEgl::defaultConfig(int devType, API api, ConfigOptions options) -{ - Q_UNUSED(devType) - Q_UNUSED(api) - Q_UNUSED(options) - NOEGL - return QEGL_NO_CONFIG; -} - - -// Choose a configuration that matches "properties". -EGLConfig QEgl::chooseConfig(const QEglProperties* properties, QEgl::PixelFormatMatch match) -{ - Q_UNUSED(properties) - Q_UNUSED(match) - NOEGL - return QEGL_NO_CONFIG; -} - -bool QEglContext::chooseConfig(const QEglProperties& properties, QEgl::PixelFormatMatch match) -{ - Q_UNUSED(properties) - Q_UNUSED(match) - NOEGL - return false; -} - -EGLSurface QEglContext::createSurface(QPaintDevice* device, const QEglProperties *properties) -{ - Q_UNUSED(device) - Q_UNUSED(properties) - NOEGL - return 0; -} - - -// Create the EGLContext. -bool QEglContext::createContext(QEglContext *shareContext, const QEglProperties *properties) -{ - Q_UNUSED(shareContext) - Q_UNUSED(properties) - NOEGL - return false; -} - -// Destroy an EGL surface object. If it was current on this context -// then call doneCurrent() for it first. -void QEglContext::destroySurface(EGLSurface surface) -{ - Q_UNUSED(surface) - NOEGL -} - -// Destroy the context. Note: this does not destroy the surface. -void QEglContext::destroyContext() -{ - NOEGL -} - -bool QEglContext::makeCurrent(EGLSurface surface) -{ - Q_UNUSED(surface) - NOEGL - return false; -} - -bool QEglContext::doneCurrent() -{ - NOEGL - return false; -} - -// Act as though doneCurrent() was called, but keep the context -// and the surface active for the moment. This allows makeCurrent() -// to skip a call to eglMakeCurrent() if we are using the same -// surface as the last set of painting operations. We leave the -// currentContext() pointer as-is for now. -bool QEglContext::lazyDoneCurrent() -{ - NOEGL - return false; -} - -bool QEglContext::swapBuffers(EGLSurface surface) -{ - Q_UNUSED(surface) - NOEGL - return false; -} - -bool QEglContext::swapBuffersRegion2NOK(EGLSurface surface, const QRegion *region) -{ - Q_UNUSED(surface) - Q_UNUSED(region) - NOEGL - return false; -} - -int QEglContext::configAttrib(int name) const -{ - Q_UNUSED(name) - NOEGL - return 0; -} - -EGLDisplay QEgl::display() -{ - NOEGL - return 0; -} - -EGLImageKHR QEgl::eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list) -{ - Q_UNUSED(dpy) - Q_UNUSED(ctx) - Q_UNUSED(target) - Q_UNUSED(buffer) - Q_UNUSED(attrib_list) - NOEGL - return 0; -} - -EGLBoolean QEgl::eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR img) -{ - Q_UNUSED(dpy) - Q_UNUSED(img) - NOEGL - return 0; -} - -EGLBoolean QEgl::eglSwapBuffersRegion2NOK(EGLDisplay dpy, EGLSurface surface, EGLint count, const EGLint *rects) -{ - Q_UNUSED(dpy); - Q_UNUSED(surface); - Q_UNUSED(count); - Q_UNUSED(rects); - NOEGL - return 0; -} - -#ifndef Q_WS_X11 -EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig cfg, const QEglProperties *properties) -{ - Q_UNUSED(device) - Q_UNUSED(cfg) - Q_UNUSED(properties) - NOEGL - return 0; -} -#endif - - -// Return the error string associated with a specific code. -QString QEgl::errorString(EGLint code) -{ - Q_UNUSED(code) - NOEGL - return QString(); -} - -// Dump all of the EGL configurations supported by the system. -void QEgl::dumpAllConfigs() -{ - NOEGL -} - -QString QEgl::extensions() -{ - NOEGL - return QString(); -} - -bool QEgl::hasExtension(const char* extensionName) -{ - Q_UNUSED(extensionName) - NOEGL - return false; -} - -QEglContext *QEglContext::currentContext(QEgl::API api) -{ - Q_UNUSED(api) - NOEGL - return 0; -} - -void QEglContext::setCurrentContext(QEgl::API api, QEglContext *context) -{ - Q_UNUSED(api) - Q_UNUSED(context) - NOEGL -} - -EGLNativeDisplayType QEgl::nativeDisplay() -{ - NOEGL - return 0; -} - -EGLNativeWindowType QEgl::nativeWindow(QWidget* widget) -{ - Q_UNUSED(widget) - NOEGL - return (EGLNativeWindowType)0; -} - -EGLNativePixmapType QEgl::nativePixmap(QPixmap*) -{ - NOEGL - return (EGLNativePixmapType)0; -} - -QT_END_NAMESPACE - - diff --git a/src/gui/egl/qeglproperties_stub.cpp b/src/gui/egl/qeglproperties_stub.cpp deleted file mode 100644 index f4009db10..000000000 --- a/src/gui/egl/qeglproperties_stub.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company 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. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -#include "qeglproperties_p.h" -#include "qeglcontext_p.h" - -QT_BEGIN_NAMESPACE - -static void noegl(const char *fn) -{ - qWarning() << fn << " called, but Qt configured without EGL" << endl; -} - -#define NOEGL noegl(__FUNCTION__); - -// Initialize a property block. -QEglProperties::QEglProperties() -{ - NOEGL -} - -QEglProperties::QEglProperties(EGLConfig cfg) -{ - Q_UNUSED(cfg) - NOEGL -} - -// Fetch the current value associated with a property. -int QEglProperties::value(int name) const -{ - Q_UNUSED(name) - NOEGL - return 0; -} - -// Set the value associated with a property, replacing an existing -// value if there is one. -void QEglProperties::setValue(int name, int value) -{ - Q_UNUSED(name) - Q_UNUSED(value) - NOEGL -} - -// Remove a property value. Returns false if the property is not present. -bool QEglProperties::removeValue(int name) -{ - Q_UNUSED(name) - NOEGL - return false; -} - -void QEglProperties::setDeviceType(int devType) -{ - Q_UNUSED(devType) - NOEGL -} - - -// Sets the red, green, blue, and alpha sizes based on a pixel format. -// Normally used to match a configuration request to the screen format. -void QEglProperties::setPixelFormat(QImage::Format pixelFormat) -{ - Q_UNUSED(pixelFormat) - NOEGL - -} - -void QEglProperties::setRenderableType(QEgl::API api) -{ - Q_UNUSED(api); - NOEGL -} - -// Reduce the complexity of a configuration request to ask for less -// because the previous request did not result in success. Returns -// true if the complexity was reduced, or false if no further -// reductions in complexity are possible. -bool QEglProperties::reduceConfiguration() -{ - NOEGL - return false; -} - -// Convert a property list to a string suitable for debug output. -QString QEglProperties::toString() const -{ - NOEGL - return QString(); -} - -void QEglProperties::setPaintDeviceFormat(QPaintDevice *dev) -{ - Q_UNUSED(dev) - NOEGL -} - -QT_END_NAMESPACE - - - - -- 2.11.0