From 08c2368911d0e992d66db5a043a96c6a66ec8893 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes.zellner@nokia.com>
Date: Wed, 9 Nov 2011 17:49:54 +0100
Subject: [PATCH] Fix build when QEGL_EXTRA_DEBUG is defined for debug output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also shift EGL configuration plot above window surface creation

Change-Id: I2de860e087cb2648b6e8e9b75365fbe78fe7687a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/platforms/eglfs/qeglfsscreen.cpp | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
index bae2c05ef18..4f83e3a5ad6 100644
--- a/src/plugins/platforms/eglfs/qeglfsscreen.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
@@ -115,9 +115,7 @@ QEglFSScreen::QEglFSScreen(EGLNativeDisplayType display)
 #endif
 
     EGLint major, minor;
-#ifdef QEGL_EXTRA_DEBUG
-    EGLint index;
-#endif
+
     if (!eglBindAPI(EGL_OPENGL_ES_API)) {
         qWarning("Could not bind GL_ES API\n");
         qFatal("EGL error");
@@ -188,6 +186,20 @@ void QEglFSScreen::createAndSetPlatformContext()
     kdRealizeWindow(window,&eglWindow);
 #endif
 
+#ifdef QEGL_EXTRA_DEBUG
+    qWarning("Configuration %d matches requirements\n", (int)config);
+
+    EGLint index;
+    for (index = 0; attrs[index].attr != -1; ++index) {
+        EGLint value;
+        if (eglGetConfigAttrib(m_dpy, config, attrs[index].attr, &value)) {
+            qWarning("\t%s: %d\n", attrs[index].name, (int)value);
+        }
+    }
+
+    qWarning("\n");
+#endif
+
     m_surface = eglCreateWindowSurface(m_dpy, config, eglWindow, NULL);
     if (m_surface == EGL_NO_SURFACE) {
         qWarning("Could not create the egl surface: error = 0x%x\n", eglGetError());
@@ -196,18 +208,6 @@ void QEglFSScreen::createAndSetPlatformContext()
     }
     //    qWarning("Created surface %dx%d\n", w, h);
 
-#ifdef QEGL_EXTRA_DEBUG
-    qWarning("Configuration %d matches requirements\n", (int)config);
-
-    for (index = 0; attrs[index].attr != -1; ++index) {
-        EGLint value;
-        if (eglGetConfigAttrib(m_dpy, config, attrs[index].attr, &value)) {
-            qWarning("\t%s: %d\n", attrs[index].name, (int)value);
-        }
-    }
-    qWarning("\n");
-#endif
-
     QEGLPlatformContext *platformContext = new QEglFSContext(platformFormat, 0, m_dpy);
     m_platformContext = platformContext;