From 070b372862c6154d36b1c8dc3f0c3684e571a4ed Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Sat, 31 Mar 2012 21:50:55 +0000 Subject: [PATCH] fg_geometry: Enable supported geometry functions for GLES2 git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1224 7f0cb862-5218-0410-a997-914c9d46530a --- include/GL/freeglut_ext.h | 2 ++ include/GL/freeglut_std.h | 4 +--- src/fg_ext.c | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h index 911f224..82dcc0a 100644 --- a/include/GL/freeglut_ext.h +++ b/include/GL/freeglut_ext.h @@ -166,9 +166,11 @@ FGAPI void FGAPIENTRY glutStrokeString( void* font, const unsigned char *stri #ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireRhombicDodecahedron( void ); FGAPI void FGAPIENTRY glutSolidRhombicDodecahedron( void ); +#endif FGAPI void FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, double offset[3], double scale ); FGAPI void FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, double offset[3], double scale ); +#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireCylinder( double radius, double height, GLint slices, GLint stacks); FGAPI void FGAPIENTRY glutSolidCylinder( double radius, double height, GLint slices, GLint stacks); #endif diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index ce0ad2a..2669006 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -525,9 +525,9 @@ FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri * Geometry functions, see freeglut_geometry.c */ -#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireCube( double size ); FGAPI void FGAPIENTRY glutSolidCube( double size ); +#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireSphere( double radius, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutSolidSphere( double radius, GLint slices, GLint stacks ); #endif @@ -536,7 +536,6 @@ FGAPI void FGAPIENTRY glutWireCone( double base, double height, GLint slices, FGAPI void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks ); #endif -#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); FGAPI void FGAPIENTRY glutSolidTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); FGAPI void FGAPIENTRY glutWireDodecahedron( void ); @@ -547,7 +546,6 @@ FGAPI void FGAPIENTRY glutWireTetrahedron( void ); FGAPI void FGAPIENTRY glutSolidTetrahedron( void ); FGAPI void FGAPIENTRY glutWireIcosahedron( void ); FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); -#endif /* * Teapot rendering functions, found in freeglut_teapot.c diff --git a/src/fg_ext.c b/src/fg_ext.c index dd8cc82..82b6304 100644 --- a/src/fg_ext.c +++ b/src/fg_ext.c @@ -126,9 +126,11 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutStrokeWidth); CHECK_NAME(glutBitmapLength); CHECK_NAME(glutStrokeLength); -#ifndef EGL_VERSION_1_0 +#ifndef GL_ES_VERSION_2_0 CHECK_NAME(glutWireSphere); CHECK_NAME(glutSolidSphere); +#endif +#ifndef EGL_VERSION_1_0 CHECK_NAME(glutWireCone); CHECK_NAME(glutSolidCone); CHECK_NAME(glutWireTorus); @@ -138,7 +140,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutWireTeapot); CHECK_NAME(glutSolidTeapot); #endif -#ifndef GL_ES_VERSION_2_0 CHECK_NAME(glutWireCube); CHECK_NAME(glutSolidCube); CHECK_NAME(glutWireDodecahedron); @@ -149,11 +150,12 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) CHECK_NAME(glutSolidTetrahedron); CHECK_NAME(glutWireIcosahedron); CHECK_NAME(glutSolidIcosahedron); +#ifndef EGL_VERSION_1_0 CHECK_NAME(glutWireRhombicDodecahedron); CHECK_NAME(glutSolidRhombicDodecahedron); +#endif CHECK_NAME(glutWireSierpinskiSponge); CHECK_NAME(glutSolidSierpinskiSponge); -#endif CHECK_NAME(glutVideoResizeGet); CHECK_NAME(glutSetupVideoResizing); CHECK_NAME(glutStopVideoResizing); -- 1.7.10.4