diff -r b72c6db6890b -r 5dc02b23752f src/gui/egl/qegl_stub.cpp --- a/src/gui/egl/qegl_stub.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/egl/qegl_stub.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -45,6 +45,8 @@ #include #include "qegl_p.h" +#include "qeglcontext_p.h" + QT_BEGIN_NAMESPACE @@ -55,12 +57,10 @@ #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) , ownsContext(true) @@ -86,6 +86,25 @@ 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) @@ -157,34 +176,53 @@ return false; } -bool QEglContext::configAttrib(int name, EGLint *value) const +int QEglContext::configAttrib(int name) const { Q_UNUSED(name) - Q_UNUSED(value) NOEGL - return false; + return 0; } -void QEglContext::clearError() -{ - NOEGL - return; -} - -EGLint QEglContext::error() +EGLDisplay QEgl::display() { NOEGL return 0; } -EGLDisplay QEglContext::display() +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; +} + + +#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) NOEGL @@ -192,18 +230,18 @@ } // Dump all of the EGL configurations supported by the system. -void QEglContext::dumpAllConfigs() +void QEgl::dumpAllConfigs() { NOEGL } -QString QEglContext::extensions() +QString QEgl::extensions() { NOEGL return QString(); } -bool QEglContext::hasExtension(const char* extensionName) +bool QEgl::hasExtension(const char* extensionName) { Q_UNUSED(extensionName) NOEGL @@ -224,27 +262,23 @@ NOEGL } -EGLNativeDisplayType QEglContext::nativeDisplay() +EGLNativeDisplayType QEgl::nativeDisplay() { NOEGL return 0; } -void QEglContext::waitClient() +EGLNativeWindowType QEgl::nativeWindow(QWidget* widget) { + Q_UNUSED(widget) NOEGL + return (EGLNativeWindowType)0; } -void QEglContext::waitNative() +EGLNativePixmapType QEgl::nativePixmap(QPixmap*) { NOEGL -} - -QEglProperties QEglContext::configProperties(EGLConfig cfg) const -{ - Q_UNUSED(cfg) - NOEGL - return QEglProperties(); + return (EGLNativePixmapType)0; } QT_END_NAMESPACE