Permalink
Browse files

try to fix an incompatibility of freetype-gl with some glext.h versions

  • Loading branch information...
1 parent aa5f406 commit bccc7417959d96a1062af99542e4b8ef7f7b9528 @core-code committed Nov 30, 2012
@@ -88,8 +88,8 @@ vertex_buffer_new( const char *format )
start = end+1;
free(desc);
attribute->pointer = pointer;
- stride += attribute->size*GL_TYPE_SIZE( attribute->type );
- pointer+= attribute->size*GL_TYPE_SIZE( attribute->type );
+ stride += attribute->size*OpenGL_TYPE_SIZE( attribute->type );
+ pointer+= attribute->size*OpenGL_TYPE_SIZE( attribute->type );
self->attributes[index] = attribute;
index++;
} while ( end && (index < MAX_VERTEX_ATTRIBUTE) );
@@ -223,7 +223,7 @@ vertex_buffer_print( vertex_buffer_t * self )
}
fprintf(stderr, "%dx%s (+%ld)\n",
self->attributes[i]->size,
- GL_TYPE_STRING( self->attributes[i]->type ),
+ OpenGL_TYPE_STRING( self->attributes[i]->type ),
(long) self->attributes[i]->pointer);
i += 1;
@@ -589,15 +589,15 @@ vertex_attribute_parse( char *format )
int size, index;
char ctype;
sscanf( format, "%dgn%d%c", &index, &size, &ctype );
- GLenum type = GL_TYPE( ctype );
+ GLenum type = OpenGL_TYPE( ctype );
return vertex_attribute_new( 0, index, size, type, GL_TRUE, 0, 0 );
}
else
{
int size, index;
char ctype;
sscanf( format, "%dg%d%c", &index, &size, &ctype );
- GLenum type = GL_TYPE( ctype );
+ GLenum type = OpenGL_TYPE( ctype );
return vertex_attribute_new( 0, index, size, type, GL_FALSE, 0, 0 );
}
}
@@ -609,7 +609,7 @@ vertex_attribute_parse( char *format )
int size;
char ctarget, ctype;
sscanf( format, "%c%d%c", &ctarget, &size, &ctype );
- GLenum type = GL_TYPE( ctype );
+ GLenum type = OpenGL_TYPE( ctype );
GLenum target = GL_VERTEX_ATTRIBUTE_TARGET( ctarget );
return vertex_attribute_new( target, 0, size, type, GL_FALSE, 0, 0 );
}
@@ -742,7 +742,7 @@ vertex_attribute_new( GLenum target,
// ----------------------------------------------------------------------------
GLenum
-GL_TYPE( char ctype )
+OpenGL_TYPE( char ctype )
{
switch( ctype )
{
@@ -785,7 +785,7 @@ GL_VERTEX_ATTRIBUTE_TARGET( char ctarget )
// ----------------------------------------------------------------------------
GLuint
-GL_TYPE_SIZE( GLenum gtype )
+OpenGL_TYPE_SIZE( GLenum gtype )
{
switch( gtype )
{
@@ -807,7 +807,7 @@ GL_TYPE_SIZE( GLenum gtype )
const char *
-GL_TYPE_STRING( GLenum gtype )
+OpenGL_TYPE_STRING( GLenum gtype )
{
switch( gtype )
{
@@ -439,7 +439,7 @@ vertex_attribute_new( GLenum target,
* @return GL enum type
*/
GLenum
- GL_TYPE( char ctype );
+ OpenGL_TYPE( char ctype );
/**
@@ -459,7 +459,7 @@ vertex_attribute_new( GLenum target,
* @return the size of the given type
*/
GLuint
- GL_TYPE_SIZE( GLenum gtype );
+ OpenGL_TYPE_SIZE( GLenum gtype );
/**
@@ -469,7 +469,7 @@ vertex_attribute_new( GLenum target,
* @return the literal string describing the type
*/
const char *
- GL_TYPE_STRING( GLenum gtype );
+ OpenGL_TYPE_STRING( GLenum gtype );
#ifdef __cplusplus
}

0 comments on commit bccc741

Please sign in to comment.