diff options
| -rw-r--r-- | src/glx/glxcmds.c | 3 | ||||
| -rw-r--r-- | src/glx/glxextensions.c | 1 | ||||
| -rw-r--r-- | src/glx/glxextensions.h | 1 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_send.py | 49 |
4 files changed, 0 insertions, 54 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 1e860dfc8eb..ee028f80266 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -2517,9 +2517,6 @@ _GLX_PUBLIC void (*glXGetProcAddressARB(const GLubyte * procName)) (void) f = (gl_function) get_glx_proc_address((const char *) procName); if ((f == NULL) && (procName[0] == 'g') && (procName[1] == 'l') && (procName[2] != 'X')) { -#ifdef GLX_INDIRECT_RENDERING - f = (gl_function) __indirect_get_proc_address((const char *) procName); -#endif if (!f) f = (gl_function) _glapi_get_proc_address((const char *) procName); #ifdef GLX_USE_APPLEGL diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c index 6cf1c24b2a7..b731042cde7 100644 --- a/src/glx/glxextensions.c +++ b/src/glx/glxextensions.c @@ -192,7 +192,6 @@ static const struct extension_info known_gl_extensions[] = { { GL(EXT_texture_lod), N, N }, { GL(EXT_texture_lod_bias), N, N }, { GL(EXT_texture_mirror_clamp), N, N }, - { GL(EXT_texture_object), N, N }, { GL(EXT_texture_rectangle), N, N }, { GL(EXT_vertex_array), N, N }, { GL(3DFX_texture_compression_FXT1), N, N }, diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h index b81d66b7d8d..3523998babd 100644 --- a/src/glx/glxextensions.h +++ b/src/glx/glxextensions.h @@ -161,7 +161,6 @@ enum GL_EXT_texture_lod_bit, GL_EXT_texture_lod_bias_bit, GL_EXT_texture_mirror_clamp_bit, - GL_EXT_texture_object_bit, GL_EXT_vertex_array_bit, GL_3DFX_texture_compression_FXT1_bit, GL_APPLE_packed_pixels_bit, diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index fb8a349ab48..1e01d5d9a2f 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -371,57 +371,8 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 1 }; if func.glx_sop and func.glx_vendorpriv: self.printFunction(func, func.glx_vendorpriv_names[0]) - self.printGetProcAddress(api) return - def printGetProcAddress(self, api): - procs = {} - for func in api.functionIterateGlx(): - for n in func.entry_points: - if func.has_different_protocol(n): - procs[n] = func.static_glx_name(n) - - print(""" -#ifdef GLX_INDIRECT_RENDERING - -static const struct proc_pair -{ - const char *name; - _glapi_proc proc; -} proc_pairs[%d] = {""" % len(procs)) - names = sorted(procs.keys()) - for i in range(len(names)): - comma = ',' if i < len(names) - 1 else '' - print(' { "%s", (_glapi_proc) gl%s }%s' % (names[i], procs[names[i]], comma)) - print("""}; - -static int -__indirect_get_proc_compare(const void *key, const void *memb) -{ - const struct proc_pair *pair = (const struct proc_pair *) memb; - return strcmp((const char *) key, pair->name); -} - -_glapi_proc -__indirect_get_proc_address(const char *name) -{ - const struct proc_pair *pair; - - /* skip "gl" */ - name += 2; - - pair = (const struct proc_pair *) bsearch((const void *) name, - (const void *) proc_pairs, ARRAY_SIZE(proc_pairs), sizeof(proc_pairs[0]), - __indirect_get_proc_compare); - - return (pair) ? pair->proc : NULL; -} - -#endif /* GLX_INDIRECT_RENDERING */ -""") - return - - def printFunction(self, func, name): footer = '}\n' if func.glx_rop == ~0: |