1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build when QEGL_EXTRA_DEBUG is defined for debug output

Browse Source 
Also shift EGL configuration plot above window surface creation

Change-Id: I2de860e087cb2648b6e8e9b75365fbe78fe7687a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Johannes Zellner 2011-11-09 17:49:54 +01:00 committed by Qt by Nokia
parent 76beb4bbb2
commit 08c2368911
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/platforms/eglfs/qeglfsscreen.cpp
View File

@ -115,9 +115,7 @@ QEglFSScreen::QEglFSScreen(EGLNativeDisplayType display)
#endif #endif
EGLint major, minor; EGLint major, minor;
#ifdef QEGL_EXTRA_DEBUG
EGLint index;
#endif
if (!eglBindAPI(EGL_OPENGL_ES_API)) { if (!eglBindAPI(EGL_OPENGL_ES_API)) {
qWarning("Could not bind GL_ES API\n"); qWarning("Could not bind GL_ES API\n");
qFatal("EGL error"); qFatal("EGL error");
@ -188,6 +186,20 @@ void QEglFSScreen::createAndSetPlatformContext()
kdRealizeWindow(window,&eglWindow); kdRealizeWindow(window,&eglWindow);
#endif #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); m_surface = eglCreateWindowSurface(m_dpy, config, eglWindow, NULL);
if (m_surface == EGL_NO_SURFACE) { if (m_surface == EGL_NO_SURFACE) {
qWarning("Could not create the egl surface: error = 0x%x\n", eglGetError()); 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); // 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); QEGLPlatformContext *platformContext = new QEglFSContext(platformFormat, 0, m_dpy);
m_platformContext = platformContext; m_platformContext = platformContext;