Integrate the OpenVG graphics system into Qt 4.6

This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.

1 files changed, 140 insertions, 0 deletions

diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
new file mode 100644
index 0000000..89949e2
--- /dev/null
+++ b/src/gui/egl/qegl_p.h
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QEGL_P_H
+#define QEGL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience of
+// the QGLWidget and QVGWidget classes.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qsize.h>
+#include <QtGui/qimage.h>
+
+#include "qeglproperties_p.h"
+
+QT_BEGIN_INCLUDE_NAMESPACE
+
+#if !defined(EGL_VERSION_1_3) && !defined(QEGL_NATIVE_TYPES_DEFINED)
+#undef EGLNativeWindowType
+#undef EGLNativePixmapType
+#undef EGLNativeDisplayType
+typedef NativeWindowType EGLNativeWindowType;
+typedef NativePixmapType EGLNativePixmapType;
+typedef NativeDisplayType EGLNativeDisplayType;
+#define QEGL_NATIVE_TYPES_DEFINED 1
+#endif
+QT_END_INCLUDE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
+
+class Q_GUI_EXPORT QEglContext
+{
+public:
+    QEglContext();
+    ~QEglContext();
+
+    bool isValid() const;
+    bool isSharing() const;
+    bool isCurrent() const;
+
+    QEgl::API api() const { return apiType; }
+    void setApi(QEgl::API api) { apiType = api; }
+
+    bool openDisplay(QPaintDevice *device);
+    bool chooseConfig(const QEglProperties& properties, QEgl::PixelFormatMatch match = QEgl::ExactPixelFormat);
+    bool createContext(QEglContext *shareContext = 0);
+    bool createSurface(QPaintDevice *device, const QEglProperties *properties = 0);
+    bool recreateSurface(QPaintDevice *device);
+    void destroySurface();
+
+    void destroy();
+
+    bool makeCurrent();
+    bool doneCurrent();
+    bool swapBuffers();
+
+    void waitNative();
+    void waitClient();
+
+    QSize surfaceSize() const;
+
+    bool configAttrib(int name, EGLint *value) const;
+
+    static void clearError() { eglGetError(); }
+    static EGLint error() { return eglGetError(); }
+    static QString errorString(EGLint code);
+
+    EGLDisplay display() const { return dpy; }
+    EGLContext context() const { return ctx; }
+    EGLSurface surface() const { return surf; }
+    void setSurface(EGLSurface surface) { surf = surface; }
+    EGLConfig config() const { return cfg; }
+
+    QEglProperties configProperties(EGLConfig cfg = 0) const;
+
+    static EGLDisplay defaultDisplay(QPaintDevice *device);
+
+    void dumpAllConfigs();
+
+private:
+    QEgl::API apiType;
+    EGLDisplay dpy;
+    EGLContext ctx;
+    EGLSurface surf;
+    EGLConfig cfg;
+    bool share;
+    bool current;
+    void *reserved;     // For extension data in future versions.
+
+    static EGLDisplay getDisplay(QPaintDevice *device);
+};
+
+QT_END_NAMESPACE
+
+#endif // QEGL_P_H