diff --git a/OpenGL.cpp b/OpenGL.cpp
index 5c6f6a4f..04d43a14 100644
--- a/OpenGL.cpp
+++ b/OpenGL.cpp
@@ -856,26 +856,23 @@ void OGL_DrawRect( int ulx, int uly, int lrx, int lry, float *color )
 		combiner.current->compiled->UpdateRenderState();
 	}
 
-	if (frameBuffer.drawBuffer != GL_FRAMEBUFFER) {
-//		glOrtho( 0, VI.width, VI.height, 0, 1.0f, -1.0f );
+	if (frameBuffer.drawBuffer != GL_FRAMEBUFFER)
 		glViewport( 0, (frameBuffer.drawBuffer == GL_BACK ? OGL.heightOffset : 0), OGL.width, OGL.height );
-	} else {
-//		glOrtho( 0, frameBuffer.top->width, frameBuffer.top->height, 0, 1.0f, -1.0f );
+	else
 		glViewport( 0, 0, frameBuffer.top->width*frameBuffer.top->scaleX, frameBuffer.top->height*frameBuffer.top->scaleY );
-	}
 	glDisable(GL_SCISSOR_TEST);
 	glDisable(GL_CULL_FACE);
 
-	OGL.rect[0].x = (float) ulx * (2.0f * VI.rwidth) - 1.0;
-	OGL.rect[0].y = (float) uly * (-2.0f * VI.rheight) + 1.0;
-	OGL.rect[1].x = (float) (lrx+1) * (2.0f * VI.rwidth) - 1.0;
+	const float scaleX = frameBuffer.drawBuffer == GL_FRAMEBUFFER ? 1.0f/frameBuffer.top->width :  VI.rwidth;
+	const float scaleY = frameBuffer.drawBuffer == GL_FRAMEBUFFER ? 1.0f/frameBuffer.top->height :  VI.rheight;
+	OGL.rect[0].x = (float) ulx * (2.0f * scaleX) - 1.0;
+	OGL.rect[0].y = (float) uly * (-2.0f * scaleY) + 1.0;
+	OGL.rect[1].x = (float) (lrx+1) * (2.0f * scaleX) - 1.0;
 	OGL.rect[1].y = OGL.rect[0].y;
 	OGL.rect[2].x = OGL.rect[0].x;
-	OGL.rect[2].y = (float) (lry+1) * (-2.0f * VI.rheight) + 1.0;
+	OGL.rect[2].y = (float) (lry+1) * (-2.0f * scaleY) + 1.0;
 	OGL.rect[3].x = OGL.rect[1].x;
 	OGL.rect[3].y = OGL.rect[2].y;
-//	OGL.rect[0].z = OGL.rect[1].z = OGL.rect[2].z = OGL.rect[3].z = (gDP.otherMode.depthSource == G_ZS_PRIM) ? gDP.primDepth.z : gSP.viewport.nearz;
-//	OGL.rect[0].w = OGL.rect[1].w = OGL.rect[2].w = OGL.rect[3].w = 1.0f;
 
 	glVertexAttrib4fv(SC_COLOR, color);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -911,21 +908,20 @@ void OGL_DrawTexturedRect( float ulx, float uly, float lrx, float lry, float uls
 	if (gSP.textureTile[0]->frameBuffer == NULL && gSP.textureTile[1]->frameBuffer == NULL && gDP.textureImage.address >= gDP.depthImageAddress &&  gDP.textureImage.address < (gDP.depthImageAddress +  gDP.colorImage.width*gDP.colorImage.width*6/4))
 		GLS_SetShadowMapCombiner();
 
-	if (frameBuffer.drawBuffer != GL_FRAMEBUFFER) {
-//		glOrtho( 0, VI.width, VI.height, 0, 1.0f, -1.0f );
+	if (frameBuffer.drawBuffer != GL_FRAMEBUFFER)
 		glViewport( 0, (frameBuffer.drawBuffer == GL_BACK ? OGL.heightOffset : 0), OGL.width, OGL.height );
-	} else {
-//		glOrtho( 0, frameBuffer.top->width, frameBuffer.top->height, 0, 1.0f, -1.0f );
+	else
 		glViewport( 0, 0, frameBuffer.top->width*frameBuffer.top->scaleX, frameBuffer.top->height*frameBuffer.top->scaleY );
-	}
 	glDisable( GL_CULL_FACE );
 
-	OGL.rect[0].x = (float) ulx * (2.0f * VI.rwidth) - 1.0f;
-	OGL.rect[0].y = (float) uly * (-2.0f * VI.rheight) + 1.0f;
-	OGL.rect[1].x = (float) (lrx) * (2.0f * VI.rwidth) - 1.0f;
+	const float scaleX = frameBuffer.drawBuffer == GL_FRAMEBUFFER ? 1.0f/frameBuffer.top->width :  VI.rwidth;
+	const float scaleY = frameBuffer.drawBuffer == GL_FRAMEBUFFER ? 1.0f/frameBuffer.top->height :  VI.rheight;
+	OGL.rect[0].x = (float) ulx * (2.0f * scaleX) - 1.0f;
+	OGL.rect[0].y = (float) uly * (-2.0f * scaleY) + 1.0f;
+	OGL.rect[1].x = (float) (lrx) * (2.0f * scaleX) - 1.0f;
 	OGL.rect[1].y = OGL.rect[0].y;
 	OGL.rect[2].x = OGL.rect[0].x;
-	OGL.rect[2].y = (float) (lry) * (-2.0f * VI.rheight) + 1.0f;
+	OGL.rect[2].y = (float) (lry) * (-2.0f * scaleY) + 1.0f;
 	OGL.rect[3].x = OGL.rect[1].x;
 	OGL.rect[3].y = OGL.rect[2].y;
 
diff --git a/gSP.cpp b/gSP.cpp
index eba8899d..f594c1bb 100644
--- a/gSP.cpp
+++ b/gSP.cpp
@@ -1935,21 +1935,22 @@ void gSPObjSprite( u32 sp )
     gDPSetTileSize( 0, 0, 0, (imageW - 1) << 2, (imageH - 1) << 2 );
     gSPTexture( 1.0f, 1.0f, 0, 0, TRUE );
 
-    //glOrtho( 0, VI.width, VI.height, 0, 0.0f, 32767.0f );
-    OGL.triangles.vertices[v0].x = 2.0f * VI.rwidth * OGL.triangles.vertices[v0].x - 1.0f;
-    OGL.triangles.vertices[v0].y = -2.0f * VI.rheight * OGL.triangles.vertices[v0].y + 1.0f;
+	const float scaleX = frameBuffer.drawBuffer == GL_FRAMEBUFFER ? 1.0f/frameBuffer.top->width :  VI.rwidth;
+	const float scaleY = frameBuffer.drawBuffer == GL_FRAMEBUFFER ? 1.0f/frameBuffer.top->height :  VI.rheight;
+    OGL.triangles.vertices[v0].x = 2.0f * scaleX * OGL.triangles.vertices[v0].x - 1.0f;
+    OGL.triangles.vertices[v0].y = -2.0f * scaleY * OGL.triangles.vertices[v0].y + 1.0f;
     OGL.triangles.vertices[v0].z = -1.0f;
     OGL.triangles.vertices[v0].w = 1.0f;
-    OGL.triangles.vertices[v1].x = 2.0f * VI.rwidth * OGL.triangles.vertices[v0].x - 1.0f;
-    OGL.triangles.vertices[v1].y = -2.0f * VI.rheight * OGL.triangles.vertices[v0].y + 1.0f;
+    OGL.triangles.vertices[v1].x = 2.0f * scaleX * OGL.triangles.vertices[v0].x - 1.0f;
+    OGL.triangles.vertices[v1].y = -2.0f * scaleY * OGL.triangles.vertices[v0].y + 1.0f;
     OGL.triangles.vertices[v1].z = -1.0f;
     OGL.triangles.vertices[v1].w = 1.0f;
-    OGL.triangles.vertices[v2].x = 2.0f * VI.rwidth * OGL.triangles.vertices[v0].x - 1.0f;
-    OGL.triangles.vertices[v2].y = -2.0f * VI.rheight * OGL.triangles.vertices[v0].y + 1.0f;
+    OGL.triangles.vertices[v2].x = 2.0f * scaleX * OGL.triangles.vertices[v0].x - 1.0f;
+    OGL.triangles.vertices[v2].y = -2.0f * scaleY * OGL.triangles.vertices[v0].y + 1.0f;
     OGL.triangles.vertices[v2].z = -1.0f;
     OGL.triangles.vertices[v2].w = 1.0f;
-    OGL.triangles.vertices[v3].x = 2.0f * VI.rwidth * OGL.triangles.vertices[v0].x - 1.0f;
-    OGL.triangles.vertices[v3].y = -2.0f * VI.rheight * OGL.triangles.vertices[v0].y + 1.0f;
+    OGL.triangles.vertices[v3].x = 2.0f * scaleX * OGL.triangles.vertices[v0].x - 1.0f;
+    OGL.triangles.vertices[v3].y = -2.0f * scaleY * OGL.triangles.vertices[v0].y + 1.0f;
     OGL.triangles.vertices[v3].z = -1.0f;
     OGL.triangles.vertices[v3].w = 1.0f;