fix GCC errors/warnings

This commit is contained in:
Chris Danford
2004-04-12 03:22:58 +00:00
parent 3597e45bbc
commit 62a05271de
+7 -7
View File
@@ -316,7 +316,7 @@ static void FlushGLErrors()
; ;
} }
static AssertNoGLError() static void AssertNoGLError()
{ {
GLenum error = glGetError(); GLenum error = glGetError();
if( error != GL_NO_ERROR ) if( error != GL_NO_ERROR )
@@ -1041,8 +1041,8 @@ public:
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles ); GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles );
AssertNoGLError(); AssertNoGLError();
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, NULL ); GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, NULL ); GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
} }
~RageModelVertexArrayHWOGL() ~RageModelVertexArrayHWOGL()
@@ -1081,8 +1081,8 @@ public:
GLExt::glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_sizeTriangles*sizeof(msTriangle), m_pTriangles, GL_STATIC_DRAW_ARB ); GLExt::glBufferDataARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_sizeTriangles*sizeof(msTriangle), m_pTriangles, GL_STATIC_DRAW_ARB );
AssertNoGLError(); AssertNoGLError();
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, NULL ); GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, NULL ); GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
} }
void Draw() const void Draw() const
{ {
@@ -1117,8 +1117,8 @@ public:
glDrawElements( GL_TRIANGLES, m_sizeTriangles*3, GL_UNSIGNED_SHORT, 0 ); //last 0 is offset in element-array glDrawElements( GL_TRIANGLES, m_sizeTriangles*3, GL_UNSIGNED_SHORT, 0 ); //last 0 is offset in element-array
AssertNoGLError(); AssertNoGLError();
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, NULL ); GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, NULL ); GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
} }
}; };