Browse Source

/dri/msg

tags/mesa_6_4
Adam Jackson 20 years ago
parent
commit
cb505bf744

+ 1
- 1
src/glx/x11/indirect.c View File

@@ -39,7 +39,7 @@

#define __GLX_PAD(n) (((n) + 3) & ~3)

# if defined(__i386__) && defined(__GNUC__)
# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
# define FASTCALL __attribute__((fastcall))
# else
# define FASTCALL

+ 2
- 2
src/glx/x11/indirect.h View File

@@ -37,12 +37,12 @@
* \author Ian Romanick <idr@us.ibm.com>
*/

# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
# define HIDDEN __attribute__((visibility("hidden")))
# else
# define HIDDEN
# endif
# if defined(__i386__) && defined(__GNUC__)
# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
# define FASTCALL __attribute__((fastcall))
# else
# define FASTCALL

+ 10
- 10
src/glx/x11/indirect_init.c View File

@@ -613,7 +613,7 @@ __GLapi * __glXNewIndirectAPI( void )
glAPI->PointParameterfEXT = __indirect_glPointParameterfEXT;
glAPI->PointParameterfvEXT = __indirect_glPointParameterfvEXT;

/* 145. GL_EXT_secondary_color */
/* 145. GL_EXT_secondary_color */

glAPI->SecondaryColor3usvEXT = __indirect_glSecondaryColor3usvEXT;
glAPI->SecondaryColorPointerEXT = __indirect_glSecondaryColorPointerEXT;
@@ -633,12 +633,12 @@ __GLapi * __glXNewIndirectAPI( void )
glAPI->SecondaryColor3uivEXT = __indirect_glSecondaryColor3uivEXT;
glAPI->SecondaryColor3usEXT = __indirect_glSecondaryColor3usEXT;

/* 148. GL_EXT_multi_draw_arrays */
/* 148. GL_EXT_multi_draw_arrays */

glAPI->MultiDrawArraysEXT = __indirect_glMultiDrawArraysEXT;
glAPI->MultiDrawElementsEXT = __indirect_glMultiDrawElementsEXT;

/* 149. GL_EXT_fog_coord */
/* 149. GL_EXT_fog_coord */

glAPI->FogCoordfEXT = __indirect_glFogCoordfEXT;
glAPI->FogCoordfvEXT = __indirect_glFogCoordfvEXT;
@@ -646,11 +646,11 @@ __GLapi * __glXNewIndirectAPI( void )
glAPI->FogCoorddvEXT = __indirect_glFogCoorddvEXT;
glAPI->FogCoordPointerEXT = __indirect_glFogCoordPointerEXT;

/* 173. GL_EXT_blend_func_separate */
/* 173. GL_EXT_blend_func_separate */

glAPI->BlendFuncSeparateEXT = __indirect_glBlendFuncSeparateEXT;

/* 197. GL_MESA_window_pos */
/* 197. GL_MESA_window_pos */

glAPI->WindowPos2dMESA = __indirect_glWindowPos2dMESA;
glAPI->WindowPos2dvMESA = __indirect_glWindowPos2dvMESA;
@@ -669,7 +669,7 @@ __GLapi * __glXNewIndirectAPI( void )
glAPI->WindowPos3sMESA = __indirect_glWindowPos3sMESA;
glAPI->WindowPos3svMESA = __indirect_glWindowPos3svMESA;

/* 233. GL_NV_vertex_program */
/* 233. GL_NV_vertex_program */

glAPI->VertexAttribs4svNV = __indirect_glVertexAttribs4svNV;
glAPI->VertexAttribs4ubvNV = __indirect_glVertexAttribs4ubvNV;
@@ -736,16 +736,16 @@ __GLapi * __glXNewIndirectAPI( void )
glAPI->VertexAttribs4dvNV = __indirect_glVertexAttribs4dvNV;
glAPI->VertexAttribs4fvNV = __indirect_glVertexAttribs4fvNV;

/* 262. GL_NV_point_sprite */
/* 262. GL_NV_point_sprite */

glAPI->PointParameteriNV = __indirect_glPointParameteriNV;
glAPI->PointParameterivNV = __indirect_glPointParameterivNV;

/* 268. GL_EXT_stencil_two_side */
/* 268. GL_EXT_stencil_two_side */

glAPI->ActiveStencilFaceEXT = __indirect_glActiveStencilFaceEXT;

/* 282. GL_NV_fragment_program */
/* 282. GL_NV_fragment_program */

glAPI->ProgramNamedParameter4fNV = __indirect_glProgramNamedParameter4fNV;
glAPI->ProgramNamedParameter4dNV = __indirect_glProgramNamedParameter4dNV;
@@ -754,7 +754,7 @@ __GLapi * __glXNewIndirectAPI( void )
glAPI->GetProgramNamedParameterfvNV = __indirect_glGetProgramNamedParameterfvNV;
glAPI->GetProgramNamedParameterdvNV = __indirect_glGetProgramNamedParameterdvNV;

/* 310. GL_EXT_framebuffer_object */
/* 310. GL_EXT_framebuffer_object */

glAPI->RenderbufferStorageEXT = __indirect_glRenderbufferStorageEXT;
glAPI->GetRenderbufferParameterivEXT = __indirect_glGetRenderbufferParameterivEXT;

+ 2
- 2
src/glx/x11/indirect_size.c View File

@@ -41,14 +41,14 @@
# define FASTCALL
# endif

# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && !defined(__CYGWIN__) && !defined(__MINGW32__)
# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
# define INTERNAL __attribute__((visibility("internal")))
# else
# define INTERNAL
# endif


#if defined(__CYGWIN__) || defined(__MINGW32__)
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
# undef HAVE_ALIAS
#endif
#ifdef HAVE_ALIAS

+ 1
- 1
src/glx/x11/indirect_size.h View File

@@ -48,7 +48,7 @@
# define FASTCALL
# endif

# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && !defined(__CYGWIN__) && !defined(__MINGW32__)
# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
# define INTERNAL __attribute__((visibility("internal")))
# else
# define INTERNAL

+ 1
- 1
src/mesa/glapi/glX_proto_size.py View File

@@ -320,7 +320,7 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
self.printVisibility( "INTERNAL", "internal" )
print ''
print ''
print '#if defined(__CYGWIN__) || defined(__MINGW32__)'
print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)'
print '# undef HAVE_ALIAS'
print '#endif'
print '#ifdef HAVE_ALIAS'

+ 1
- 1
src/mesa/glapi/gl_XML.py View File

@@ -214,7 +214,7 @@ class gl_print_base:
"""

self.undef_list.append(S)
print """# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && !defined(__CYGWIN__) && !defined(__MINGW32__)
print """# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
# define %s __attribute__((visibility("%s")))
# else
# define %s

+ 1
- 1
src/mesa/main/enums.c View File

@@ -3267,6 +3267,7 @@ static const enum_elt all_enums[1612] =

static const unsigned reduced_enums[1232] =
{
26, /* GL_ALL_CLIENT_ATTRIB_BITS */
389, /* GL_FALSE */
561, /* GL_LINES */
563, /* GL_LINE_LOOP */
@@ -4498,7 +4499,6 @@ static const unsigned reduced_enums[1232] =
1212, /* GL_SCISSOR_BIT */
25, /* GL_ALL_ATTRIB_BITS */
845, /* GL_MULTISAMPLE_BIT */
26, /* GL_ALL_CLIENT_ATTRIB_BITS */
};

#define Elements(x) sizeof(x)/sizeof(*x)

Loading…
Cancel
Save