From 3dd299c3d5b88114894ec30d1fac85fba688201f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 20 Aug 2019 15:43:06 -0400 Subject: glx: Sync with Khronos Minor fixups required to keep the prototypes matching and to remove mention of retired enums. Acked-by: Eric Engestrom Reviewed-by: Eric Anholt --- src/glx/apple/glx_empty.c | 2 +- src/glx/glx_pbuffer.c | 4 ++-- src/glx/tests/query_renderer_unittest.cpp | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/glx') diff --git a/src/glx/apple/glx_empty.c b/src/glx/apple/glx_empty.c index b7afbce7dd5..1b3abca6daa 100644 --- a/src/glx/apple/glx_empty.c +++ b/src/glx/apple/glx_empty.c @@ -147,7 +147,7 @@ glXCopySubBufferMESA(Display * dpy, GLXDrawable drawable, } -_X_EXPORT int +_X_EXPORT void glXQueryGLXPbufferSGIX(Display * dpy, GLXDrawable drawable, int attribute, unsigned int *value) { diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c index fd3327f1209..6bdb6354f45 100644 --- a/src/glx/glx_pbuffer.c +++ b/src/glx/glx_pbuffer.c @@ -834,11 +834,11 @@ glXQueryDrawable(Display * dpy, GLXDrawable drawable, /** * Query an attribute of a pbuffer. */ -_GLX_PUBLIC int +_GLX_PUBLIC void glXQueryGLXPbufferSGIX(Display * dpy, GLXPbufferSGIX drawable, int attribute, unsigned int *value) { - return __glXGetDrawableAttribute(dpy, drawable, attribute, value); + __glXGetDrawableAttribute(dpy, drawable, attribute, value); } #endif diff --git a/src/glx/tests/query_renderer_unittest.cpp b/src/glx/tests/query_renderer_unittest.cpp index dc88cc94f49..1323ab770e3 100644 --- a/src/glx/tests/query_renderer_unittest.cpp +++ b/src/glx/tests/query_renderer_unittest.cpp @@ -171,7 +171,6 @@ TEST_F(query_renderer_string_test, invalid_attribute) E(GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA), E(GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA), E(GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA), - E(GLX_RENDERER_ID_MESA), }; for (unsigned i = 0; i < ARRAY_SIZE(invalid_attributes); i++) { @@ -322,7 +321,6 @@ TEST_F(query_renderer_integer_test, invalid_attribute) E(GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA + 0x10000), E(GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA + 0x10000), E(GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA + 0x10000), - E(GLX_RENDERER_ID_MESA + 0x10000), }; for (unsigned i = 0; i < ARRAY_SIZE(invalid_attributes); i++) { -- cgit v1.2.3