/[gentoo-x86]/x11-base/xorg-server/files/xorg-server-glapi_c.patch
Gentoo

Contents of /x11-base/xorg-server/files/xorg-server-glapi_c.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download)
Tue Jun 12 11:27:07 2012 UTC (2 years, 2 months ago) by chithanh
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +0 -0 lines
Re-add xorg-server-1.9, which is still needed for some users.

(Portage version: 2.2.0_alpha109/cvs/Linux x86_64, RepoMan options: --force)

1 From 17d9e374721d6c8ee3f7f9cdc882f80127bdb57f Mon Sep 17 00:00:00 2001
2 From: Adam Jackson <ajax@redhat.com>
3 Date: Wed, 02 Mar 2011 18:21:39 +0000
4 Subject: glx: Lobotomize _glapi_get_proc_address
5
6 This isn't a meaningful thing in the indirect glx loader, so just warn
7 if it ever happens and move on.
8
9 But also, mark it PUBLIC, so if the driver does ever call it we merely
10 warn instead of aborting because ld.so can't find the symbol.
11
12 Reviewed-by: Dave Airlie <airlied@redhat.com>
13 Signed-off-by: Adam Jackson <ajax@redhat.com>
14 ---
15 diff --git a/glx/glapi.c b/glx/glapi.c
16 index 1814493..79ff6b1 100644
17 --- a/glx/glapi.c
18 +++ b/glx/glapi.c
19 @@ -54,6 +54,7 @@
20
21 #include <dix-config.h>
22 #include <X11/Xfuncproto.h>
23 +#include <os.h>
24 #define PUBLIC _X_EXPORT
25
26 #else
27 @@ -713,43 +714,15 @@ _glapi_add_dispatch( const char * const * function_names,
28 return offset;
29 }
30
31 -/**
32 - * Return pointer to the named function. If the function name isn't found
33 - * in the name of static functions, try generating a new API entrypoint on
34 - * the fly with assembly language.
35 +/*
36 + * glXGetProcAddress doesn't exist in the protocol, the drivers never call
37 + * this themselves, and neither does the server. warn if it happens though.
38 */
39 -_glapi_proc
40 +PUBLIC _glapi_proc
41 _glapi_get_proc_address(const char *funcName)
42 {
43 - struct _glapi_function * entry;
44 - GLuint i;
45 -
46 -#ifdef MANGLE
47 - if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l')
48 - return NULL;
49 -#else
50 - if (funcName[0] != 'g' || funcName[1] != 'l')
51 - return NULL;
52 -#endif
53 -
54 - /* search extension functions first */
55 - for (i = 0; i < NumExtEntryPoints; i++) {
56 - if (strcmp(ExtEntryTable[i].name, funcName) == 0) {
57 - return ExtEntryTable[i].dispatch_stub;
58 - }
59 - }
60 -
61 -#if !defined( XFree86Server ) && !defined( XGLServer )
62 - /* search static functions */
63 - {
64 - const _glapi_proc func = get_static_proc_address(funcName);
65 - if (func)
66 - return func;
67 - }
68 -#endif /* !defined( XFree86Server ) */
69 -
70 - entry = add_function_name(funcName);
71 - return (entry == NULL) ? NULL : entry->dispatch_stub;
72 + ErrorF("_glapi_get_proc_address called!\n");
73 + return NULL;
74 }
75
76 /**
77 --
78 cgit v0.8.3-6-g21f6

  ViewVC Help
Powered by ViewVC 1.1.20