Merge pull request #354 from mcclure/glGetError

Miscellaneous OpenGL error fixes

Core/Contents/Source/PolyGLRenderer.cpp

@@ -505,7 +505,6 @@ void OpenGLRenderer::_setOrthoMode(Number orthoSizeX, Number orthoSizeY) {
 	
 	if(!orthoMode) {
 		glMatrixMode(GL_PROJECTION);
-		glPushMatrix();
 		glLoadIdentity();
 		glOrtho(-orthoSizeX*0.5,orthoSizeX*0.5,-orthoSizeY*0.5,orthoSizeY*0.5,-farPlane,farPlane);
 		orthoMode = true;
@@ -528,7 +527,6 @@ void OpenGLRenderer::setOrthoMode(Number xSize, Number ySize, bool centered) {
 	glDisable(GL_LIGHTING);
 	glMatrixMode(GL_PROJECTION);
 	glDisable(GL_CULL_FACE);
-	glPushMatrix();
 	glLoadIdentity();
 		
 	if(centered) {
@@ -556,7 +554,6 @@ void OpenGLRenderer::setPerspectiveMode() {
 		glEnable (GL_DEPTH_TEST);
 		glEnable(GL_CULL_FACE);
 		glMatrixMode( GL_PROJECTION );
-		glPopMatrix();
 		glMatrixMode( GL_MODELVIEW );
 		orthoMode = false;
 	}
@@ -591,7 +588,7 @@ void OpenGLRenderer::bindFrameBufferTextureDepth(Texture *texture) {
 	if(!texture)
 		return;
 	OpenGLTexture *glTexture = (OpenGLTexture*)texture;
-	glBindFramebufferEXT(GL_RENDERBUFFER_EXT, glTexture->getFrameBufferID());
+	glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, glTexture->getFrameBufferID());
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);	
 }
 
@@ -606,7 +603,7 @@ void OpenGLRenderer::bindFrameBufferTexture(Texture *texture) {
 
 void OpenGLRenderer::unbindFramebuffers() {
 	glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-	glBindFramebufferEXT(GL_RENDERBUFFER_EXT, 0);
+	glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
 }
 
 void OpenGLRenderer::createRenderTextures(Texture **colorBuffer, Texture **depthBuffer, int width, int height, bool floatingPointBuffer) {

Core/Contents/Source/PolyGLTexture.cpp

@@ -84,7 +84,7 @@ void OpenGLTexture::recreateFromImageData() {
 			}
 		
 			if(createMipmaps) {
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 				if(textureData) {
 					gluBuild2DMipmaps(GL_TEXTURE_2D, glTextureFormat, width, height, glTextureType, pixelType, textureData );