From 32e2d8e58c819efcfc8db1b1add198947091333f Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 29 Jul 2014 10:54:37 +0200 Subject: Do not show warning on null result in getProcAddress Other platforms do not do this either. What is more, some of the extension handling code will try to resolve functions that are not necessiarly present, and this is not an error. Change-Id: I39dad8f8d89fc45de3ea83f04727a8e38b6a3387 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowseglcontext.cpp | 2 +- src/plugins/platforms/windows/qwindowsglcontext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp index 3fdfb55dcf..c62875d0ef 100644 --- a/src/plugins/platforms/windows/qwindowseglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp @@ -751,7 +751,7 @@ QFunctionPointer QWindowsEGLContext::getProcAddress(const QByteArray &procName) QFunctionPointer procAddress = reinterpret_cast(QWindowsEGLStaticContext::libEGL.eglGetProcAddress(procName.constData())); if (QWindowsContext::verbose > 1) qCDebug(lcQpaGl) << __FUNCTION__ << procName << QWindowsEGLStaticContext::libEGL.eglGetCurrentContext() << "returns" << procAddress; - if (!procAddress) + if (!procAddress && QWindowsContext::verbose) qWarning("%s: Unable to resolve '%s'", __FUNCTION__, procName.constData()); return procAddress; } diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index e336c6414e..e09018ef69 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -1397,7 +1397,7 @@ QFunctionPointer QWindowsGLContext::getProcAddress(const QByteArray &procName) QFunctionPointer procAddress = reinterpret_cast(QOpenGLStaticContext::opengl32.wglGetProcAddress(procName.constData())); if (QWindowsContext::verbose > 1) qCDebug(lcQpaGl) << __FUNCTION__ << procName << QOpenGLStaticContext::opengl32.wglGetCurrentContext() << "returns" << procAddress; - if (!procAddress) + if (!procAddress && QWindowsContext::verbose) qWarning("%s: Unable to resolve '%s'", __FUNCTION__, procName.constData()); return procAddress; } -- cgit v1.2.3