From f3f51bc844c8749250724d164722402cb9a07dc7 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 11 Oct 2006 22:37:14 +0000 Subject: Fix bug #4681. glDeleteTextures and glDeleteTexturesEXT were erroneously listed as aliases of each other. For anything /except/ GLX protocol they are aliases. This set of changes allows functions that are functionally identical but have different GLX protocol to be listed as aliases. When building with GLX_INDIRECT_RENDERING set, different static functions are used. These functions determine whether the current context is direct rendering or not. If the context is direct rendering, the aliased function (e.g., glDeleteTextures in the case of glDeleteTexturesEXT) is called. If the context is not direct rendering, the correct GLX protocol is sent. For a deeper explanation of what is changed, please see: http://dri.freedesktop.org/wiki/PartiallyAliasedFunctions --- src/mesa/glapi/glX_server_table.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/mesa/glapi/glX_server_table.py') diff --git a/src/mesa/glapi/glX_server_table.py b/src/mesa/glapi/glX_server_table.py index 14d1c40258..f3962f875b 100644 --- a/src/mesa/glapi/glX_server_table.py +++ b/src/mesa/glapi/glX_server_table.py @@ -207,7 +207,12 @@ class function_table: else: size_name = "" - temp = [op, "__glXDisp_%s" % (func.name), "__glXDispSwap_%s" % (func.name), size, size_name] + if func.glx_vendorpriv == op: + func_name = func.glx_vendorpriv_names[0] + else: + func_name = func.name + + temp = [op, "__glXDisp_%s" % (func_name), "__glXDispSwap_%s" % (func_name), size, size_name] else: temp = [op, "NULL", "NULL", 0, ""] @@ -368,9 +373,9 @@ class PrintGlxDispatchTables(glX_proto_common.glx_print_proto): if not f.ignore and f.vectorequiv == None: if f.glx_rop != 0: self.rop_functions.append(f.glx_rop, f) - elif f.glx_sop != 0: + if f.glx_sop != 0: self.sop_functions.append(f.glx_sop, f) - elif f.glx_vendorpriv != 0: + if f.glx_vendorpriv != 0: self.vop_functions.append(f.glx_vendorpriv, f) self.sop_functions.Print() -- cgit v1.2.3