[Vm-dev] [commit] r2271 - iOS open/GL work

[commits at squeakvm.org]

Author: johnmci
Date: 2010-09-01 19:56:12 -0700 (Wed, 01 Sep 2010)
New Revision: 2271

Modified:
   trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m
Log:
iOS open/GL work
minor changes based on open/gl benchmarking

Modified: trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m
===================================================================
--- trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m	2010-09-01 06:37:28 UTC (rev 2270)
+++ trunk/platforms/iOS/vm/OSX/sqSqueakOSXNSView.m	2010-09-02 02:56:12 UTC (rev 2271)
@@ -146,7 +146,7 @@
 		clippyIsEmpty = YES;
 		CGL_MACRO_DECLARE_VARIABLES();
 		glFlush();
-		[[self openGLContext] flushBuffer];  //Not sure if double buffering works, need more testing.
+		[[self openGLContext] flushBuffer];  
 	}
 	if (!firstDrawCompleted) {
 		firstDrawCompleted = YES;
@@ -165,7 +165,6 @@
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 	glClearColor(1.0, 1.0, 1.0, 1.0);
 	glColor4f(1.0, 1.0, 1.0, 1.0);
-	glDisable(GL_TEXTURE_2D);
 	
 	glDisable(GL_DITHER);
 	glDisable(GL_ALPHA_TEST);
@@ -174,6 +173,9 @@
 	glDisable(GL_FOG);
 	glDisable(GL_TEXTURE_2D);
 	glDisable(GL_DEPTH_TEST);
+	glDisable (GL_SCISSOR_TEST);
+    glDisable (GL_CULL_FACE);
+	glStencilMask(0);
 	glPixelZoom(1.0,1.0);
 	
 	glEnable(GL_TEXTURE_RECTANGLE_ARB);