OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glapi/glx: For GLX code, use the existing _X_HIDDEN and _X_INTERNAL defines

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Ian Romanick
2011-12-08 10:58:06 -08:00
parent bc35da409b
commit 0c6b930322
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mapi/glapi/gen/glX_proto_recv.py
View File

@@ -41,7 +41,8 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base):
def printRealHeader(self): def printRealHeader(self):
self.printVisibility( "HIDDEN", "hidden" ) print '# include <X11/Xfuncproto.h>'
print ''
print 'struct __GLXclientStateRec;' print 'struct __GLXclientStateRec;'
print '' print ''
return return
@@ -51,16 +52,16 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base):
for func in api.functionIterateAll(): for func in api.functionIterateAll():
if not func.ignore and not func.vectorequiv: if not func.ignore and not func.vectorequiv:
if func.glx_rop: if func.glx_rop:
print 'extern HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name) print 'extern _X_HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name)
print 'extern HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name) print 'extern _X_HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name)
elif func.glx_sop or func.glx_vendorpriv: elif func.glx_sop or func.glx_vendorpriv:
print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) print 'extern _X_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 __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name)
if func.glx_sop and func.glx_vendorpriv: if func.glx_sop and func.glx_vendorpriv:
n = func.glx_vendorpriv_names[0] n = func.glx_vendorpriv_names[0]
print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n)
return return

16
src/mapi/glapi/gen/glX_proto_send.py
View File

@@ -1008,25 +1008,25 @@ class PrintGlxProtoInit_h(gl_XML.gl_print_base):
* \\author Ian Romanick <idr@us.ibm.com> * \\author Ian Romanick <idr@us.ibm.com>
*/ */
""" """
self.printVisibility( "HIDDEN", "hidden" )
self.printFastcall() self.printFastcall()
self.printNoinline() self.printNoinline()
print """ print """
#include <X11/Xfuncproto.h>
#include "glxclient.h" #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 ); 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, struct glx_context * gc, unsigned max_dim, GLint width, GLint height,
GLint depth, GLenum format, GLenum type, void * dest, GLint depth, GLenum format, GLenum type, void * dest,
GLboolean dimensions_in_reply ); 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 ); 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 ); 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(): for func in api.functionIterateGlx():
params = func.get_parameter_string() 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: for n in func.entry_points:
if func.has_different_protocol(n): if func.has_different_protocol(n):
asdf = func.static_glx_name(n) asdf = func.static_glx_name(n)
if asdf not in func.static_entry_points: 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 # give it a easy-to-remember name
if func.client_handcode: if func.client_handcode:
print '#define gl_dispatch_stub_%s gl%s' % (n, asdf) print '#define gl_dispatch_stub_%s gl%s' % (n, asdf)
@@ -1052,7 +1052,7 @@ extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
print '' print ''
print '#ifdef GLX_SHARED_GLAPI' 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' print '#endif'

19
src/mapi/glapi/gen/glX_proto_size.py
View File

@@ -225,7 +225,7 @@ class glx_enum_function:
def Print(self, name): def Print(self, name):
print 'INTERNAL PURE FASTCALL GLint' print '_X_INTERNAL PURE FASTCALL GLint'
print '__gl%s_size( GLenum e )' % (name) print '__gl%s_size( GLenum e )' % (name)
print '{' print '{'
@@ -313,6 +313,7 @@ class PrintGlxSizeStubs_common(gl_XML.gl_print_base):
class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
def printRealHeader(self): def printRealHeader(self):
print '' print ''
print '#include <X11/Xfuncproto.h>'
print '#include <GL/gl.h>' print '#include <GL/gl.h>'
if self.emit_get: if self.emit_get:
print '#include "indirect_size_get.h"' print '#include "indirect_size_get.h"'
@@ -326,20 +327,18 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
print '' print ''
self.printFastcall() self.printFastcall()
print '' print ''
self.printVisibility( "INTERNAL", "internal" )
print ''
print '' print ''
print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)' print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)'
print '# undef HAVE_ALIAS' print '# undef HAVE_ALIAS'
print '#endif' print '#endif'
print '#ifdef HAVE_ALIAS' print '#ifdef HAVE_ALIAS'
print '# define ALIAS2(from,to) \\' 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 ' __attribute__ ((alias( # to )));'
print '# define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )' print '# define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )'
print '#else' print '#else'
print '# define ALIAS(from,to) \\' 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 ' { return __gl ## to ## _size( e ); }'
print '#endif' print '#endif'
print '' print ''
@@ -379,12 +378,12 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common):
* \\author Ian Romanick <idr@us.ibm.com> * \\author Ian Romanick <idr@us.ibm.com>
*/ */
""" """
print '#include <X11/Xfuncproto.h>'
print ''
self.printPure(); self.printPure();
print '' print ''
self.printFastcall(); self.printFastcall();
print '' print ''
self.printVisibility( "INTERNAL", "internal" );
print ''
def printBody(self, api): def printBody(self, api):
@@ -394,7 +393,7 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common):
continue continue
if (ef.is_set() and self.emit_set) or (not ef.is_set() and self.emit_get): 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): class PrintGlxReqSize_common(gl_XML.gl_print_base):
@@ -418,7 +417,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common):
def printRealHeader(self): def printRealHeader(self):
self.printVisibility("HIDDEN", "hidden") print '#include <X11/Xfuncproto.h>'
print '' print ''
self.printPure() self.printPure()
print '' print ''
@@ -427,7 +426,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common):
def printBody(self, api): def printBody(self, api):
for func in api.functionIterateGlx(): for func in api.functionIterateGlx():
if not func.ignore and func.has_variable_size_request(): 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): class PrintGlxReqSize_c(PrintGlxReqSize_common):