From: Ian Romanick Date: Thu, 8 Dec 2011 18:58:06 +0000 (-0800) Subject: glapi/glx: For GLX code, use the existing _X_HIDDEN and _X_INTERNAL defines X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c6b9303227977723a6d03664f71e5eb56ebf139;p=mesa.git glapi/glx: For GLX code, use the existing _X_HIDDEN and _X_INTERNAL defines Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Adam Jackson --- diff --git a/src/mapi/glapi/gen/glX_proto_recv.py b/src/mapi/glapi/gen/glX_proto_recv.py index f423c6db084..b577bb6bd63 100644 --- a/src/mapi/glapi/gen/glX_proto_recv.py +++ b/src/mapi/glapi/gen/glX_proto_recv.py @@ -41,7 +41,8 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base): def printRealHeader(self): - self.printVisibility( "HIDDEN", "hidden" ) + print '# include ' + print '' print 'struct __GLXclientStateRec;' print '' return @@ -51,16 +52,16 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base): for func in api.functionIterateAll(): if not func.ignore and not func.vectorequiv: if func.glx_rop: - print 'extern HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name) - print 'extern HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name) + print 'extern _X_HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name) + print 'extern _X_HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name) elif func.glx_sop or func.glx_vendorpriv: - print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) - print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) + print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) + print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) if func.glx_sop and func.glx_vendorpriv: n = func.glx_vendorpriv_names[0] - print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) - print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) + print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) + print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) return diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index 6330d91f77a..bec0222188f 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -1008,25 +1008,25 @@ class PrintGlxProtoInit_h(gl_XML.gl_print_base): * \\author Ian Romanick */ """ - self.printVisibility( "HIDDEN", "hidden" ) self.printFastcall() self.printNoinline() print """ +#include #include "glxclient.h" -extern HIDDEN NOINLINE CARD32 __glXReadReply( Display *dpy, size_t size, +extern _X_HIDDEN NOINLINE CARD32 __glXReadReply( Display *dpy, size_t size, void * dest, GLboolean reply_is_always_array ); -extern HIDDEN NOINLINE void __glXReadPixelReply( Display *dpy, +extern _X_HIDDEN NOINLINE void __glXReadPixelReply( Display *dpy, struct glx_context * gc, unsigned max_dim, GLint width, GLint height, GLint depth, GLenum format, GLenum type, void * dest, GLboolean dimensions_in_reply ); -extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupSingleRequest( +extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupSingleRequest( struct glx_context * gc, GLint sop, GLint cmdlen ); -extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest( +extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest( struct glx_context * gc, GLint code, GLint vop, GLint cmdlen ); """ @@ -1035,13 +1035,13 @@ extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest( for func in api.functionIterateGlx(): params = func.get_parameter_string() - print 'extern HIDDEN %s __indirect_gl%s(%s);' % (func.return_type, func.name, params) + print 'extern _X_HIDDEN %s __indirect_gl%s(%s);' % (func.return_type, func.name, params) for n in func.entry_points: if func.has_different_protocol(n): asdf = func.static_glx_name(n) if asdf not in func.static_entry_points: - print 'extern HIDDEN %s gl%s(%s);' % (func.return_type, asdf, params) + print 'extern _X_HIDDEN %s gl%s(%s);' % (func.return_type, asdf, params) # give it a easy-to-remember name if func.client_handcode: print '#define gl_dispatch_stub_%s gl%s' % (n, asdf) @@ -1052,7 +1052,7 @@ extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest( print '' print '#ifdef GLX_SHARED_GLAPI' - print 'extern HIDDEN void (*__indirect_get_proc_address(const char *name))(void);' + print 'extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void);' print '#endif' diff --git a/src/mapi/glapi/gen/glX_proto_size.py b/src/mapi/glapi/gen/glX_proto_size.py index f16ea4c3b68..b31d1c65050 100644 --- a/src/mapi/glapi/gen/glX_proto_size.py +++ b/src/mapi/glapi/gen/glX_proto_size.py @@ -225,7 +225,7 @@ class glx_enum_function: def Print(self, name): - print 'INTERNAL PURE FASTCALL GLint' + print '_X_INTERNAL PURE FASTCALL GLint' print '__gl%s_size( GLenum e )' % (name) print '{' @@ -313,6 +313,7 @@ class PrintGlxSizeStubs_common(gl_XML.gl_print_base): class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): def printRealHeader(self): print '' + print '#include ' print '#include ' if self.emit_get: print '#include "indirect_size_get.h"' @@ -326,20 +327,18 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): print '' self.printFastcall() print '' - self.printVisibility( "INTERNAL", "internal" ) - print '' print '' print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)' print '# undef HAVE_ALIAS' print '#endif' print '#ifdef HAVE_ALIAS' print '# define ALIAS2(from,to) \\' - print ' INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' + print ' _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' print ' __attribute__ ((alias( # to )));' print '# define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )' print '#else' print '# define ALIAS(from,to) \\' - print ' INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' + print ' _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' print ' { return __gl ## to ## _size( e ); }' print '#endif' print '' @@ -379,12 +378,12 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common): * \\author Ian Romanick */ """ + print '#include ' + print '' self.printPure(); print '' self.printFastcall(); print '' - self.printVisibility( "INTERNAL", "internal" ); - print '' def printBody(self, api): @@ -394,7 +393,7 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common): continue if (ef.is_set() and self.emit_set) or (not ef.is_set() and self.emit_get): - print 'extern INTERNAL PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name) + print 'extern _X_INTERNAL PURE FASTCALL GLint __gl%s_size(GLenum);' % (func.name) class PrintGlxReqSize_common(gl_XML.gl_print_base): @@ -418,7 +417,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common): def printRealHeader(self): - self.printVisibility("HIDDEN", "hidden") + print '#include ' print '' self.printPure() print '' @@ -427,7 +426,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common): def printBody(self, api): for func in api.functionIterateGlx(): if not func.ignore and func.has_variable_size_request(): - print 'extern PURE HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap);' % (func.name) + print 'extern PURE _X_HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap);' % (func.name) class PrintGlxReqSize_c(PrintGlxReqSize_common):