Re: [Mesa-dev] [PATCH] fixup! EGL: Implement the libglvnd interface for EGL (v2)
On 17.01.2017 18:31, Kyle Brenneman wrote: > On 01/16/2017 02:32 PM, Adam Jackson wrote: >> On Thu, 2017-01-05 at 14:29 -0700, Kyle Brenneman wrote: >>> --- >>> src/egl/generate/eglFunctionList.py | 6 -- >>> 1 file changed, 4 insertions(+), 2 deletions(-) >> Reviewed-by: Adam Jackson >> >> Is this too invasive for 13.1? >> >> - ajax >> > If it helps, almost all of the libglvnd code just sits on top of the > existing EGL library, and a non-libglvnd build doesn't even compile it. > Other than the makefile, the only change that would affect a > non-libglvnd build is for the client extension string in eglQueryString. Ping? Surely these can land in master by now? Fedora ships them, and they work fine on Debian too, so: Tested-by: Timo Aaltonen -- t ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] fixup! EGL: Implement the libglvnd interface for EGL (v2)
On 01/16/2017 02:32 PM, Adam Jackson wrote: On Thu, 2017-01-05 at 14:29 -0700, Kyle Brenneman wrote: --- src/egl/generate/eglFunctionList.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Adam Jackson Is this too invasive for 13.1? - ajax If it helps, almost all of the libglvnd code just sits on top of the existing EGL library, and a non-libglvnd build doesn't even compile it. Other than the makefile, the only change that would affect a non-libglvnd build is for the client extension string in eglQueryString. -Kyle ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] fixup! EGL: Implement the libglvnd interface for EGL (v2)
On Thu, 2017-01-05 at 14:29 -0700, Kyle Brenneman wrote: > --- > src/egl/generate/eglFunctionList.py | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Adam Jackson Is this too invasive for 13.1? - ajax ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] fixup! EGL: Implement the libglvnd interface for EGL (v2)
I can if that's preferable. On 01/11/2017 04:24 PM, Timo Aaltonen wrote: On 05.01.2017 23:29, Kyle Brenneman wrote: --- src/egl/generate/eglFunctionList.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/egl/generate/eglFunctionList.py b/src/egl/generate/eglFunctionList.py index b19b5f7..80cb834 100644 --- a/src/egl/generate/eglFunctionList.py +++ b/src/egl/generate/eglFunctionList.py @@ -53,12 +53,14 @@ method values: Select the vendor that owns the current context. """ -def _eglFunc(name, method, static=False, public=False, inheader=None, prefix="", extension=None, retval=None): +def _eglFunc(name, method, static=None, public=False, inheader=None, prefix="dispatch_", extension=None, retval=None): """ A convenience function to define an entry in the EGL function list. """ +if static is None: +static = (not public and method != "custom") if inheader is None: -inheader = (not public) +inheader = (not static) values = { "method" : method, "prefix" : prefix, You probably need to send a v3 with this added? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] fixup! EGL: Implement the libglvnd interface for EGL (v2)
On 05.01.2017 23:29, Kyle Brenneman wrote: > --- > src/egl/generate/eglFunctionList.py | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/src/egl/generate/eglFunctionList.py > b/src/egl/generate/eglFunctionList.py > index b19b5f7..80cb834 100644 > --- a/src/egl/generate/eglFunctionList.py > +++ b/src/egl/generate/eglFunctionList.py > @@ -53,12 +53,14 @@ method values: > Select the vendor that owns the current context. > """ > > -def _eglFunc(name, method, static=False, public=False, inheader=None, > prefix="", extension=None, retval=None): > +def _eglFunc(name, method, static=None, public=False, inheader=None, > prefix="dispatch_", extension=None, retval=None): > """ > A convenience function to define an entry in the EGL function list. > """ > +if static is None: > +static = (not public and method != "custom") > if inheader is None: > -inheader = (not public) > +inheader = (not static) > values = { > "method" : method, > "prefix" : prefix, You probably need to send a v3 with this added? -- t ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] fixup! EGL: Implement the libglvnd interface for EGL (v2)
--- src/egl/generate/eglFunctionList.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/egl/generate/eglFunctionList.py b/src/egl/generate/eglFunctionList.py index b19b5f7..80cb834 100644 --- a/src/egl/generate/eglFunctionList.py +++ b/src/egl/generate/eglFunctionList.py @@ -53,12 +53,14 @@ method values: Select the vendor that owns the current context. """ -def _eglFunc(name, method, static=False, public=False, inheader=None, prefix="", extension=None, retval=None): +def _eglFunc(name, method, static=None, public=False, inheader=None, prefix="dispatch_", extension=None, retval=None): """ A convenience function to define an entry in the EGL function list. """ +if static is None: +static = (not public and method != "custom") if inheader is None: -inheader = (not public) +inheader = (not static) values = { "method" : method, "prefix" : prefix, -- 2.7.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] fixup! EGL: Implement the libglvnd interface for EGL.
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