Remove a couple of leftover hacks in the previous libglvnd patch. --- src/egl/main/egldispatchstubs.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/egl/main/egldispatchstubs.c b/src/egl/main/egldispatchstubs.c index 212a1fd..e02abd7 100644 --- a/src/egl/main/egldispatchstubs.c +++ b/src/egl/main/egldispatchstubs.c @@ -5,15 +5,6 @@ #include "eglcurrent.h" -// HACK: This should call the EGL_KHR_debug callback. -static void -_eglDebugReportFull(EGLenum error, const char *command, const char *funcName, - EGLint type, void *objectLabel, const char *message, ...) -{ - _eglError(error, command); -} -#define EGL_DEBUG_MSG_ERROR_KHR 0 - static const __EGLapiExports *exports; const int __EGL_DISPATCH_FUNC_COUNT = __EGL_DISPATCH_COUNT; @@ -72,8 +63,7 @@ static __eglMustCastToProperFunctionPointerType FetchVendorFunc(__EGLvendorInfo } if (func == NULL) { if (errorCode != EGL_SUCCESS) { - _eglDebugReportFull(errorCode, __EGL_DISPATCH_FUNC_NAMES[index], - __EGL_DISPATCH_FUNC_NAMES[index], EGL_DEBUG_MSG_ERROR_KHR, NULL, NULL); + _eglError(errorCode, __EGL_DISPATCH_FUNC_NAMES[index]); } return NULL; } @@ -81,8 +71,7 @@ static __eglMustCastToProperFunctionPointerType FetchVendorFunc(__EGLvendorInfo if (!exports->setLastVendor(vendor)) { // Don't bother trying to set an error code in libglvnd. If // setLastVendor failed, then setEGLError would also fail. - _eglDebugReportFull(errorCode, __EGL_DISPATCH_FUNC_NAMES[index], - __EGL_DISPATCH_FUNC_NAMES[index], EGL_DEBUG_MSG_ERROR_KHR, NULL, NULL); + _eglError(errorCode, __EGL_DISPATCH_FUNC_NAMES[index]); return NULL; } @@ -116,6 +105,6 @@ __eglMustCastToProperFunctionPointerType __eglDispatchFetchByDevice(EGLDeviceEXT exports->threadInit(); vendor = exports->getVendorFromDevice(dev); - return FetchVendorFunc(vendor, index, EGL_BAD_DISPLAY); + return FetchVendorFunc(vendor, index, EGL_BAD_DEVICE_EXT); } -- 2.7.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev