From 6fa64d06f3eb475017d292b96535985c59f9778e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 24 Nov 2010 00:46:26 +0000 Subject: [PATCH] Handle glXGetProcAddressARB --- glapi.py | 22 ++++++++++++++++++++++ glxtrace.py | 7 ++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/glapi.py b/glapi.py index af00465..3d78755 100644 --- a/glapi.py +++ b/glapi.py @@ -3294,6 +3294,27 @@ def extended_functions(Function): F(Void, "glProgramNamedParameter4fvNV", [(GLuint, "id"), (GLsizei, "len"), (OpaquePointer(Const(GLubyte)), "name"), (Array(Const(GLfloat), "4"), "v")]), F(Void, "glDepthBoundsEXT", [(GLclampd, "zmin"), (GLclampd, "zmax")]), F(Void, "glBlendEquationSeparateEXT", [(GLenum, "modeRGB"), (GLenum, "modeA")]), + + F(Void, "glBindFramebuffer", [(GLenum, "target"), (framebuffer, "framebuffer")]), + F(Void, "glBindRenderbuffer", [(GLenum, "target"), (renderbuffer, "renderbuffer")]), + F(GLenum, "glCheckFramebufferStatus", [(GLenum, "target")]), + F(Void, "glDeleteFramebuffers", [(GLsizei, "n"), (Array(Const(framebuffer), "n"), "framebuffers")]), + F(Void, "glDeleteRenderbuffers", [(GLsizei, "n"), (Array(Const(renderbuffer), "n"), "renderbuffers")]), + F(Void, "glFramebufferRenderbuffer", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "renderbuffertarget"), (GLuint, "renderbuffer")]), + F(Void, "glFramebufferTexture1D", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (texture, "texture"), (GLint, "level")]), + F(Void, "glFramebufferTexture2D", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (texture, "texture"), (GLint, "level")]), + F(Void, "glFramebufferTexture3D", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (texture, "texture"), (GLint, "level"), (GLint, "zoffset")]), + F(Void, "glGenFramebuffers", [(GLsizei, "n"), Out(Array(framebuffer, "n"), "framebuffers")]), + F(Void, "glGenRenderbuffers", [(GLsizei, "n"), Out(Array(renderbuffer, "n"), "renderbuffers")]), + F(Void, "glGenerateMipmap", [(GLenum, "target")]), + F(Void, "glGetFramebufferAttachmentParameteriv", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "pname"), (OpaquePointer(GLint), "params")], sideeffects=False), + F(Void, "glGetRenderbufferParameteriv", [(GLenum, "target"), (GLenum, "pname"), (OpaquePointer(GLint), "params")], sideeffects=False), + F(GLboolean, "glIsFramebuffer", [(framebuffer, "framebuffer")]), + F(GLboolean, "glIsRenderbuffer", [(renderbuffer, "renderbuffer")]), + F(Void, "glRenderbufferStorage", [(GLenum, "target"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]), + F(Void, "glBlitFramebuffer", [(GLint, "srcX0"), (GLint, "srcY0"), (GLint, "srcX1"), (GLint, "srcY1"), (GLint, "dstX0"), (GLint, "dstY0"), (GLint, "dstX1"), (GLint, "dstY1"), (GLbitfield_attrib, "mask"), (GLenum, "filter")]), + F(Void, "glFramebufferTextureLayer", [(GLenum, "target"), (GLenum, "attachment"), (texture, "texture"), (GLint, "level"), (GLint, "layer")]), + F(Void, "glBindFramebufferEXT", [(GLenum, "target"), (framebuffer, "framebuffer")]), F(Void, "glBindRenderbufferEXT", [(GLenum, "target"), (renderbuffer, "renderbuffer")]), F(GLenum, "glCheckFramebufferStatusEXT", [(GLenum, "target")]), @@ -3313,6 +3334,7 @@ def extended_functions(Function): F(Void, "glRenderbufferStorageEXT", [(GLenum, "target"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]), F(Void, "glBlitFramebufferEXT", [(GLint, "srcX0"), (GLint, "srcY0"), (GLint, "srcX1"), (GLint, "srcY1"), (GLint, "dstX0"), (GLint, "dstY0"), (GLint, "dstX1"), (GLint, "dstY1"), (GLbitfield_attrib, "mask"), (GLenum, "filter")]), F(Void, "glFramebufferTextureLayerEXT", [(GLenum, "target"), (GLenum, "attachment"), (texture, "texture"), (GLint, "level"), (GLint, "layer")]), + F(Void, "glStencilFuncSeparateATI", [(GLenum, "frontfunc"), (GLenum, "backfunc"), (GLint, "ref"), (GLuint, "mask")]), F(Void, "glProgramEnvParameters4fvEXT", [(GLenum, "target"), (GLuint, "index"), (GLsizei, "count"), (OpaquePointer(Const(GLfloat)), "params")]), F(Void, "glProgramLocalParameters4fvEXT", [(GLenum, "target"), (GLuint, "index"), (GLsizei, "count"), (OpaquePointer(Const(GLfloat)), "params")]), diff --git a/glxtrace.py b/glxtrace.py index 1874f94..1b9aeac 100644 --- a/glxtrace.py +++ b/glxtrace.py @@ -35,14 +35,15 @@ PROC = Opaque("__GLXextFuncPtr") glxapi.add_functions(glapi.functions) glxapi.add_functions([ - Function(PROC, "glXGetProcAddress", [(Alias("const GLubyte *", String), "procName")]) + Function(PROC, "glXGetProcAddressARB", [(Alias("const GLubyte *", String), "procName")]), + Function(PROC, "glXGetProcAddress", [(Alias("const GLubyte *", String), "procName")]), ]) class GlxTracer(trace.Tracer): def get_function_address(self, function): - if function.name == "glXGetProcAddress": + if function.name.startswith("glXGetProcAddress"): return 'dlsym(RTLD_NEXT, "%s")' % (function.name,) else: print ' if (!pglXGetProcAddress) {' @@ -53,7 +54,7 @@ class GlxTracer(trace.Tracer): return 'pglXGetProcAddress((const GLubyte *)"%s")' % (function.name,) def wrap_ret(self, function, instance): - if function.name == "glXGetProcAddress": + if function.name.startswith("glXGetProcAddress"): print ' if (%s) {' % instance for f in glxapi.functions: ptype = self.function_pointer_type(f) -- 2.45.2