AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile error in eglconvenience

Browse Source 
Change-Id: Ic20d890a9c59e21a5f0c81f961074ab02083a266
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
This commit is contained in:
Girish Ramakrishnan 2012-05-29 21:01:14 -07:00 committed by Qt by Nokia
parent 46ae50a5d0
commit 56fca8ce14
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platformsupport/eglconvenience/qeglconvenience.cpp
View File

@ -347,12 +347,12 @@ static struct AttrInfo attrs[] = {
{EGL_MAX_SWAP_INTERVAL, "EGL_MAX_SWAP_INTERVAL"},
{-1, 0}};
void q_printEglConfig(EGLConfig config)
void q_printEglConfig(EGLDisplay display, EGLConfig config)
{
EGLint index;
for (index = 0; attrs[index].attr != -1; ++index) {
EGLint value;
if (eglGetConfigAttrib(m_dpy, config, attrs[index].attr, &value)) {
if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
qWarning("\t%s: %d\n", attrs[index].name, (int)value);
}
}

2
src/platformsupport/eglconvenience/qeglconvenience_p.h
View File

@ -54,7 +54,7 @@ bool q_reduceConfigAttributes(QVector<EGLint> *configAttributes);
EGLConfig q_configFromGLFormat(EGLDisplay display, const QSurfaceFormat &format, bool highestPixelFormat = false, int surfaceType = EGL_WINDOW_BIT);
QSurfaceFormat q_glFormatFromConfig(EGLDisplay display, const EGLConfig config);
bool q_hasEglExtension(EGLDisplay display,const char* extensionName);
void q_printEglConfig(EGLConfig config);
void q_printEglConfig(EGLDisplay display, EGLConfig config);
QT_END_NAMESPACE

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

@ -172,8 +172,7 @@ void QEglFSScreen::createAndSetPlatformContext()
m_window = hooks->createNativeWindow(hooks->screenSize());
#ifdef QEGL_EXTRA_DEBUG
qWarning("Configuration %d matches requirements\n", (int)config);
q_printEglConfig(config);
q_printEglConfig(m_dpy, config);
#endif
m_surface = eglCreateWindowSurface(m_dpy, config, m_window, NULL);