Changeset 769 for trunk/src/opengl/qglpixelbuffer_egl.cpp

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/opengl/qglpixelbuffer_egl.cpp (modified) (2 diffs)

trunk/src/opengl/qglpixelbuffer_egl.cpp

@@ -65 +65 @@
     ctx = new QEglContext();
     ctx->setApi(QEgl::OpenGL);
-
-    // Open the EGL display.
-    if (!ctx->openDisplay(0)) {
-        delete ctx;
-        ctx = 0;
-        return false;
-    }
 
     // Find the shared context.
@@ -216 +209 @@
 {
     // See if we have at least 1 configuration that matches the default format.
-    EGLDisplay dpy = QEglContext::defaultDisplay(0);
+    EGLDisplay dpy = QEglContext::display();
     if (dpy == EGL_NO_DISPLAY)
         return false;