Changeset 846 for trunk/src/gui/egl/qegl_stub.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/egl/qegl_stub.cpp (modified) (8 diffs)

trunk/src/gui/egl/qegl_stub.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -46 +46 @@
 
 #include "qegl_p.h"
+#include "qeglcontext_p.h"
+
 
 QT_BEGIN_NAMESPACE
@@ -55 +57 @@
 
 #define NOEGL noegl(__FUNCTION__);
-
-EGLDisplay QEglContext::dpy = 0;
 
 QEglContext::QEglContext()
     : apiType(QEgl::OpenGL)
     , ctx(0)
-    , cfg(0)
+    , cfg(QEGL_NO_CONFIG)
     , currentSurface(0)
     , current(false)
@@ -85 +85 @@
     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;
 }
 
@@ -158 +177 @@
 }
 
-bool QEglContext::configAttrib(int name, EGLint *value) const
+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)
-    Q_UNUSED(value)
-    NOEGL
-    return false;
-}
-
-void QEglContext::clearError()
-{
-    NOEGL
-    return;
-}
-
-EGLint QEglContext::error()
-{
-    NOEGL
-    return 0;
-}
-
-EGLDisplay QEglContext::display()
-{
-    NOEGL
-    return 0;
-}
+    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 QEglContext::errorString(EGLint code)
+QString QEgl::errorString(EGLint code)
 {
     Q_UNUSED(code)
@@ -193 +248 @@
 
 // Dump all of the EGL configurations supported by the system.
-void QEglContext::dumpAllConfigs()
-{
-    NOEGL
-}
-
-QString QEglContext::extensions()
+void QEgl::dumpAllConfigs()
+{
+    NOEGL
+}
+
+QString QEgl::extensions()
 {
     NOEGL
@@ -204 +259 @@
 }
 
-bool QEglContext::hasExtension(const char* extensionName)
+bool QEgl::hasExtension(const char* extensionName)
 {
     Q_UNUSED(extensionName)
@@ -225 +280 @@
 }
 
-EGLNativeDisplayType QEglContext::nativeDisplay()
-{
-    NOEGL
-    return 0;
-}
-
-void QEglContext::waitClient()
-{
-    NOEGL
-}
-
-void QEglContext::waitNative()
-{
-    NOEGL
-}
-
-QEglProperties QEglContext::configProperties(EGLConfig cfg) const
-{
-    Q_UNUSED(cfg)
-    NOEGL
-    return QEglProperties();
+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;
 }