Changeset 769 for trunk/src/gui/egl

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/egl/egl.pri (modified) (1 diff)
• src/gui/egl/qegl.cpp (modified) (20 diffs)
• src/gui/egl/qegl_p.h (modified) (5 diffs)
• src/gui/egl/qegl_qws.cpp (modified) (1 diff)
• src/gui/egl/qegl_stub.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/gui/egl/qegl_stub.cpp )
• src/gui/egl/qegl_symbian.cpp (modified) (1 diff)
• src/gui/egl/qegl_wince.cpp (modified) (1 diff)
• src/gui/egl/qegl_x11.cpp (modified) (1 diff)
• src/gui/egl/qeglproperties.cpp (modified) (3 diffs)
• src/gui/egl/qeglproperties_p.h (modified) (2 diffs)
• src/gui/egl/qeglproperties_stub.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/gui/egl/qeglproperties_stub.cpp )

trunk/src/gui/egl/egl.pri

@@ -1 @@
-CONFIG += egl
+contains(QT_CONFIG, egl): {
+        CONFIG += egl
 
-HEADERS += \
-    egl/qegl_p.h \
-    egl/qeglproperties_p.h
+HEADERS += \
+    egl/qegl_p.h \
+    egl/qeglproperties_p.h
 
-SOURCES += \
-    egl/qegl.cpp \
-    egl/qeglproperties.cpp
+SOURCES += \
+    egl/qegl.cpp \
+    egl/qeglproperties.cpp
 
-wince*: SOURCES += egl/qegl_wince.cpp
+wince*: SOURCES += egl/qegl_wince.cpp
 
-unix {
-    embedded {
-        SOURCES += egl/qegl_qws.cpp
-    } else {
-        symbian {
-            SOURCES += egl/qegl_symbian.cpp
-        } else {
-            SOURCES += egl/qegl_x11.cpp
-        }
-    }
+        unix {
+            embedded {
+                SOURCES += egl/qegl_qws.cpp
+            } else {
+                symbian {
+                    SOURCES += egl/qegl_symbian.cpp
+                } else {
+                    SOURCES += egl/qegl_x11.cpp
+                }
+            }
+        }
+} else:symbian {
+        DEFINES += QT_NO_EGL
+        SOURCES += egl/qegl_stub.cpp
+        SOURCES += egl/qeglproperties_stub.cpp
 }

trunk/src/gui/egl/qegl.cpp

@@ -43 +43 @@
 #include <QtGui/qpixmap.h>
 #include <QtGui/qwidget.h>
+
 #include <QtCore/qdebug.h>
 #include "qegl_p.h"
 
 QT_BEGIN_NAMESPACE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 // Current GL and VG contexts.  These are used to determine if
@@ -55 +84 @@
 static QEglContext * volatile currentVGContext = 0;
 
+
+
 QEglContext::QEglContext()
     : apiType(QEgl::OpenGL)
-    , dpy(EGL_NO_DISPLAY)
     , ctx(EGL_NO_CONTEXT)
     , cfg(0)
@@ -65 +95 @@
     , sharing(false)
 {
+
 }
 
 QEglContext::~QEglContext()
 {
-    destroy();
+    destroy();
 
     if (currentGLContext == this)
@@ -75 +106 @@
     if (currentVGContext == this)
         currentVGContext = 0;
+
 }
 
@@ -85 +117 @@
 {
     return current;
-}
-
-// Open the EGL display associated with "device".
-bool QEglContext::openDisplay(QPaintDevice *device)
-{
-    if (dpy == EGL_NO_DISPLAY)
-        dpy = defaultDisplay(device);
-    return (dpy != EGL_NO_DISPLAY);
 }
 
@@ -103 +127 @@
         // Get the number of matching configurations for this set of properties.
         EGLint matching = 0;
-        if (!eglChooseConfig(dpy, props.properties(), 0, 0, &matching) || !matching)
+        if (!eglChooseConfig(d, props.properties(), 0, 0, &matching) || !matching)
             continue;
 
@@ -109 +133 @@
         // matching configuration.
         if (match == QEgl::BestPixelFormat) {
-            eglChooseConfig(dpy, props.properties(), &cfg, 1, &matching);
+            eglChooseConfig(d, props.properties(), &cfg, 1, &matching);
             if (matching < 1)
                 continue;
@@ -119 +143 @@
         EGLint size = matching;
         EGLConfig *configs = new EGLConfig [size];
-        eglChooseConfig(dpy, props.properties(), configs, size, &matching);
+        eglChooseConfig(d, props.properties(), configs, size, &matching);
         for (EGLint index = 0; index < size; ++index) {
             EGLint red, green, blue, alpha;
-            eglGetConfigAttrib(dpy, configs[index], EGL_RED_SIZE, &red);
-            eglGetConfigAttrib(dpy, configs[index], EGL_GREEN_SIZE, &green);
-            eglGetConfigAttrib(dpy, configs[index], EGL_BLUE_SIZE, &blue);
-            eglGetConfigAttrib(dpy, configs[index], EGL_ALPHA_SIZE, &alpha);
+            eglGetConfigAttrib(d, configs[index], EGL_RED_SIZE, &red);
+            eglGetConfigAttrib(d, configs[index], EGL_GREEN_SIZE, &green);
+            eglGetConfigAttrib(d, configs[index], EGL_BLUE_SIZE, &blue);
+            eglGetConfigAttrib(d, configs[index], EGL_ALPHA_SIZE, &alpha);
             if (red == props.value(EGL_RED_SIZE) &&
                     green == props.value(EGL_GREEN_SIZE) &&
@@ -180 +204 @@
         shareContext = 0;
     if (shareContext) {
-        ctx = eglCreateContext(dpy, cfg, shareContext->ctx, contextProps.properties());
+        ctx = eglCreateContext(d, cfg, shareContext->ctx, contextProps.properties());
         if (ctx == EGL_NO_CONTEXT) {
             qWarning() << "QEglContext::createContext(): Could not share context:" << errorString(eglGetError());
@@ -189 +213 @@
     }
     if (ctx == EGL_NO_CONTEXT) {
-        ctx = eglCreateContext(dpy, cfg, 0, contextProps.properties());
+        ctx = eglCreateContext(d, cfg, 0, contextProps.properties());
         if (ctx == EGL_NO_CONTEXT) {
             qWarning() << "QEglContext::createContext(): Unable to create EGL context:" << errorString(eglGetError());
@@ -205 +229 @@
         if (surface == currentSurface)
             doneCurrent();
-        eglDestroySurface(dpy, surface);
+        eglDestroySurface(d, surface);
     }
 }
 
 // Destroy the context.  Note: this does not destroy the surface.
-void QEglContext::destroy()
+void QEglContext::destroy()
 {
     if (ctx != EGL_NO_CONTEXT && ownsContext)
-        eglDestroyContext(dpy, ctx);
-    dpy = EGL_NO_DISPLAY;
+        eglDestroyContext(display(), ctx);
     ctx = EGL_NO_CONTEXT;
     cfg = 0;
@@ -249 +272 @@
 #endif
 
-    bool ok = eglMakeCurrent(dpy, surface, surface, ctx);
+    bool ok = eglMakeCurrent(d, surface, surface, ctx);
     if (!ok)
         qWarning() << "QEglContext::makeCurrent():" << errorString(eglGetError());
@@ -278 +301 @@
 #endif
 
-    bool ok = eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    bool ok = eglMakeCurrent(d, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
     if (!ok)
         qWarning() << "QEglContext::doneCurrent():" << errorString(eglGetError());
@@ -300 +323 @@
         return false;
 
-    bool ok = eglSwapBuffers(dpy, surface);
+    bool ok = eglSwapBuffers(d, surface);
     if (!ok)
         qWarning() << "QEglContext::swapBuffers():" << errorString(eglGetError());
@@ -339 +362 @@
 bool QEglContext::configAttrib(int name, EGLint *value) const
 {
-    return eglGetConfigAttrib(dpy, cfg, name, value);
+    return eglGetConfigAttrib(display(), cfg, name, value);
+}
+
+void QEglContext::clearError()
+{
+    eglGetError();
+}
+
+EGLint QEglContext::error()
+{
+    return eglGetError();
 }
 
@@ -351 +384 @@
     for (int name = 0x3020; name <= 0x304F; ++name) {
         EGLint value;
-        if (name != EGL_NONE && eglGetConfigAttrib(dpy, cfg, name, &value))
+        if (name != EGL_NONE && eglGetConfigAttrib(d, cfg, name, &value))
             props.setValue(name, value);
     }
@@ -358 +391 @@
 }
 
-// Initialize and return the default display.
-EGLDisplay QEglContext::defaultDisplay(QPaintDevice *device)
-{
-    static EGLDisplay dpy = EGL_NO_DISPLAY;
-    if (dpy == EGL_NO_DISPLAY) {
-        dpy = getDisplay(device);
+EGLDisplay QEglContext::display()
+{
+    if (!QEglContextTracker::displayOpened()) {
+        dpy = eglGetDisplay(nativeDisplay());
+        QEglContextTracker::setDisplayOpened();
         if (dpy == EGL_NO_DISPLAY) {
-            qWarning() << "QEglContext::defaultDisplay(): Cannot open EGL display";
+            qWarning("QEglContext::display(): Falling back to EGL_DEFAULT_DISPLAY");
+            dpy = eglGetDisplay(EGLNativeDisplayType(EGL_DEFAULT_DISPLAY));
+        }
+        if (dpy == EGL_NO_DISPLAY) {
+            qWarning("QEglContext::display(): Can't even open the default display");
             return EGL_NO_DISPLAY;
         }
+
         if (!eglInitialize(dpy, NULL, NULL)) {
-            qWarning() << "QEglContext::defaultDisplay(): Cannot initialize EGL display:" << errorString(eglGetError());
+            qWarning() << "QEglContext::display(): Cannot initialize EGL display:" << errorString(eglGetError());
             return EGL_NO_DISPLAY;
         }
-#ifdef EGL_OPENGL_ES_API
-        eglBindAPI(EGL_OPENGL_ES_API);
-#endif
-    }
+    }
+
     return dpy;
 }
+
+
+
+
+
+
+
 
 // Return the error string associated with a specific code.
@@ -411 +453 @@
     QEglProperties props;
     EGLint count = 0;
-    if (!eglGetConfigs(dpy, 0, 0, &count) || count < 1)
+    if (!eglGetConfigs(d, 0, 0, &count) || count < 1)
         return;
     EGLConfig *configs = new EGLConfig [count];
-    eglGetConfigs(dpy, configs, count, &count);
+    eglGetConfigs(d, configs, count, &count);
     for (EGLint index = 0; index < count; ++index) {
         props = configProperties(configs[index]);
@@ -424 +466 @@
 QString QEglContext::extensions()
 {
-    const char* exts = eglQueryString(QEglContext::defaultDisplay(0), EGL_EXTENSIONS);
+    const char* exts = eglQueryString(QEglContext::d), EGL_EXTENSIONS);
     return QString(QLatin1String(exts));
 }
@@ -432 +474 @@
     QList<QByteArray> extensions =
         QByteArray(reinterpret_cast<const char *>
-            (eglQueryString(QEglContext::defaultDisplay(0), EGL_EXTENSIONS))).split(' ');
+            (eglQueryString(QEglContext::d), EGL_EXTENSIONS))).split(' ');
     return extensions.contains(extensionName);
 }

trunk/src/gui/egl/qegl_p.h

@@ -87 +87 @@
     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, const QEglProperties *properties = 0);
+
     EGLSurface createSurface(QPaintDevice *device, const QEglProperties *properties = 0);
     void destroySurface(EGLSurface surface);
-
-    void destroy();
 
     bool makeCurrent(EGLSurface surface);
@@ -105 +103 @@
     bool configAttrib(int name, EGLint *value) const;
 
-    static void clearError() { eglGetError(); }
-    static EGLint error() { return eglGetError(); }
+    static void clearError()
+    static EGLint error()
     static QString errorString(EGLint code);
 
-    EGLDisplay display() const { return dpy; }
+    
 
     EGLContext context() const { return ctx; }
@@ -119 +117 @@
     QEglProperties configProperties(EGLConfig cfg = 0) const;
 
-    static EGLDisplay defaultDisplay(QPaintDevice *device);
-
     void dumpAllConfigs();
 
@@ -128 +124 @@
 private:
     QEgl::API apiType;
-    EGLDisplay dpy;
     EGLContext ctx;
     EGLConfig cfg;
@@ -136 +131 @@
     bool sharing;
 
-    static EGLDisplay getDisplay(QPaintDevice *device);
+    static EGLDisplay dpy;
+    static EGLNativeDisplayType nativeDisplay();
 
     static QEglContext *currentContext(QEgl::API api);

trunk/src/gui/egl/qegl_qws.cpp

@@ -65 +65 @@
 }
 
-EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
-{
-    Q_UNUSED(device);
-    return eglGetDisplay(EGLNativeDisplayType(EGL_DEFAULT_DISPLAY));
-}
-
 static QScreen *screenForDevice(QPaintDevice *device)
 {

trunk/src/gui/egl/qegl_symbian.cpp

@@ -79 +79 @@
     EGLSurface surf;
     if (devType == QInternal::Widget)
-        surf = eglCreateWindowSurface(dpy, cfg, windowDrawable, 0);
+        surf = eglCreateWindowSurface(dpy, cfg, windowDrawable, );
     else
-        surf = eglCreatePixmapSurface(dpy, cfg, pixmapDrawable, 0);
+        surf = eglCreatePixmapSurface(dpy, cfg, pixmapDrawable, );
     if (surf == EGL_NO_SURFACE)
         qWarning("QEglContext::createSurface(): Unable to create EGL surface, error = 0x%x", eglGetError());
     return surf;
-}
-
-EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
-{
-    EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    if (dpy == EGL_NO_DISPLAY)
-        qWarning("QEglContext::defaultDisplay(): Falling back to EGL_DEFAULT_DISPLAY");
-    return dpy;
 }
 

trunk/src/gui/egl/qegl_wince.cpp

@@ -88 +88 @@
 }
 
-EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
+EGL)
 {
-    EGLDisplay dpy = 0;
-    HWND win = (static_cast<QWidget*>(device))->winId();
-    HDC myDc = GetDC(win);
+    HDC myDc = GetDC(0);
+
     if (!myDc) {
-        qWarning("QEglContext::defaultDisplay(): WinCE display is not open");
+        qWarning("QEglContext::nativeDisplay(): WinCE display is not open");
+        return EGL_DEFAULT_DISPLAY;
     }
-    dpy = eglGetDisplay(EGLNativeDisplayType(myDc));
-    if (dpy == EGL_NO_DISPLAY) {
-        qWarning("QEglContext::defaultDisplay(): Falling back to EGL_DEFAULT_DISPLAY");
-        dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    }
-    return dpy;
+    return EGLNativeDisplayType(myDc);
 }
 

trunk/src/gui/egl/qegl_x11.cpp

@@ -94 +94 @@
 }
 
-EGLDisplay QEglContext::getDisplay(QPaintDevice *device)
+EGL)
 {
-    Q_UNUSED(device);
     Display *xdpy = QX11Info::display();
     if (!xdpy) {
         qWarning("QEglContext::getDisplay(): X11 display is not open");
-        return EGL_NO_DISPLAY;
+        return EGL;
     }
-    return eglGetDisplay(EGLNativeDisplayType(xdpy));
+    return );
 }
 

trunk/src/gui/egl/qeglproperties.cpp

@@ -40 +40 @@
 ****************************************************************************/
 
-#include "qeglproperties_p.h"
-
-QT_BEGIN_NAMESPACE
-
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
+
+
+
+
 
 #include "qegl_p.h"
@@ -61 +61 @@
     for (int name = 0x3020; name <= 0x304F; ++name) {
         EGLint value;
-        if (name != EGL_NONE && eglGetConfigAttrib(QEglContext::defaultDisplay(0), cfg, name, &value))
+        if (name != EGL_NONE && eglGetConfigAttrib(QEglContext::d), cfg, name, &value))
             setValue(name, value);
     }
@@ -274 +274 @@
 {
     EGLint count = 0;
-    eglGetConfigs(QEglContext::defaultDisplay(0), 0, 0, &count);
+    eglGetConfigs(QEglContext::d), 0, 0, &count);
     if (count < 1)
         return;
 
     EGLConfig *configs = new EGLConfig [count];
-    eglGetConfigs(QEglContext::defaultDisplay(0), configs, count, &count);
+    eglGetConfigs(QEglContext::d), configs, count, &count);
     for (EGLint index = 0; index < count; ++index)
         qWarning() << QEglProperties(configs[index]).toString();

trunk/src/gui/egl/qeglproperties_p.h

@@ -59 +59 @@
 QT_BEGIN_INCLUDE_NAMESPACE
 
+
+
+
+
+
 #if defined(QT_GLES_EGL)
-#include <GLES/egl.h>
+#include <GLES/egl.h>
 #else
-#include <EGL/egl.h>
+#include <EGL/egl.h>
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #if defined(Q_WS_X11)
@@ -99 +123 @@
         BestPixelFormat
     };
-};
+}
 
 class QX11Info;