Changeset 846 for trunk/src/opengl/qgl_qws.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/opengl/qgl_qws.cpp (modified) (4 diffs)

trunk/src/opengl/qgl_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -118 +118 @@
     else
         return false;
-}
-
-void qt_egl_add_platform_config(QEglProperties& props, QPaintDevice *device)
-{
-    // Find the QGLScreen for this paint device.
-    QGLScreen *glScreen = glScreenForDevice(device);
-    if (!glScreen) {
-        qWarning("QGLContext::chooseContext(): The screen is not a QGLScreen");
-        return;
-    }
-    int devType = device->devType();
-    if (devType == QInternal::Image)
-        props.setPixelFormat(static_cast<QImage *>(device)->format());
-    else
-        props.setPixelFormat(glScreen->pixelFormat());
 }
 
@@ -198 +183 @@
     // Get the display and initialize it.
     d->eglContext = new QEglContext();
+
     d->eglContext->setApi(QEgl::OpenGL);
 
     // Construct the configuration we need for this surface.
     QEglProperties configProps;
-    qt_egl_add_platform_config(configProps, device());
-    qt_egl_set_format(configProps, devType, d->glFormat);
+    qt_eglproperties_set_glformat(configProps, d->glFormat);
+    configProps.setDeviceType(devType);
+    configProps.setPaintDeviceFormat(device());
     configProps.setRenderableType(QEgl::OpenGL);
 
@@ -215 +202 @@
 
     // Inform the higher layers about the actual format properties.
-    qt_egl_update_format(*(d->eglContext), d->glFormat);
+    qt_);
 
     // Create a new context for the configuration.