From: Adam Jackson Date: Tue, 3 Dec 2013 18:11:52 +0000 (-0500) Subject: glx: Remove function stubs X-Git-Tag: xorg-server-1.14.99.904~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1fd143f2847ef425ec9891d9e1cba44a1bb007d;p=platform%2Fupstream%2Fxorg-server.git glx: Remove function stubs Now that we're calling non-1.2 ABI things by function pointer this is no longer needed. Signed-off-by: Adam Jackson Reviewed-by: Jeremy Huddleston Sequoia Reviewed-by: Jon TURNEY --- diff --git a/glx/Makefile.am b/glx/Makefile.am index 44d3a7d..54e8140 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -70,7 +70,6 @@ libglx_la_SOURCES = \ glxscreens.c \ glxscreens.h \ glxserver.h \ - glxstubs.c \ glxutil.h \ render2.c \ render2swap.c \ diff --git a/glx/glxstubs.c b/glx/glxstubs.c deleted file mode 100644 index 69bc004..0000000 --- a/glx/glxstubs.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright © 2013 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Authors: - * Adam Jackson - */ - -/* - * Redirection stubs for things that we call by name but that aren't exported - * from libGL by name. Strictly speaking this list should be a lot longer, - * but this is enough to get us linking against contemporary Mesa. - */ - -#include -#include "glxserver.h" - -#define thunk(name, type, call_args, ...) \ - _X_HIDDEN void name(__VA_ARGS__) { \ - static type proc; \ - if (!proc) proc = __glGetProcAddress(#name); \ - proc call_args; \ - } - -thunk(glSampleMaskSGIS, PFNGLSAMPLEMASKSGISPROC, - (value, invert), GLclampf value, GLboolean invert) - -thunk(glSamplePatternSGIS, PFNGLSAMPLEPATTERNSGISPROC, - (pattern), GLenum pattern) - -thunk(glActiveStencilFaceEXT, PFNGLACTIVESTENCILFACEEXTPROC, - (face), GLenum face)