X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=nanoWrap.cpp;h=9cf8c7c2055bc96645be154220b88f2da5c6119c;hb=5bdf537d06bac340e861338af9c3fea99d3724cf;hp=8749bfbf3a98a7e00858124d1cb075625638e46f;hpb=ff570586136c0e09212a18d77ed14b57264edb90;p=nanogl.git

diff --git a/nanoWrap.cpp b/nanoWrap.cpp
index 8749bfb..9cf8c7c 100644
--- a/nanoWrap.cpp
+++ b/nanoWrap.cpp
@@ -67,8 +67,8 @@ struct nanoState
 	GLboolean scissor_test;
 	GLboolean stencil_test;
 	GLboolean depthmask;
-	GLclampf depth_range_near;
-	GLclampf depth_range_far;
+	GLclampd depth_range_near;
+	GLclampd depth_range_far;
 	GLenum depth_func;
 	GLenum cullface;
 	GLenum shademodel;
@@ -789,12 +789,11 @@ void glEnable( GLenum cap )
 	}
 	case GL_STENCIL_TEST:
 	{
-		return;
 		if (!nanoglState.stencil_test)
-                {
-                nanoglState.stencil_test = GL_TRUE;
-                statechanged = GL_TRUE;
-                }
+		{
+			nanoglState.stencil_test = GL_TRUE;
+			statechanged = GL_TRUE;
+		}
 		break;
 	}
 	case GL_TEXTURE_2D:
@@ -1095,12 +1094,11 @@ void glDisable( GLenum cap )
 	}
 	case GL_STENCIL_TEST:
 	{
-		return;
 		if (nanoglState.stencil_test)
-                {
-                nanoglState.stencil_test = GL_FALSE;
-                statechanged = GL_TRUE;
-                }
+		{
+			nanoglState.stencil_test = GL_FALSE;
+			statechanged = GL_TRUE;
+		}
 		break;
 	}
 	case GL_TEXTURE_2D:
@@ -1190,7 +1188,7 @@ void glColor4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
 	currentVertexAttrib.alpha = (unsigned char)ClampTo255( alpha * 255.0f );
 }
 
-void glOrtho( GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar )
+void glOrtho( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar )
 {
 	FlushOnStateChange( );
 #ifdef USE_CORE_PROFILE
@@ -1281,7 +1279,7 @@ void glTexImage2D( GLenum target, GLint level, GLint internalformat, GLsizei wid
 {
 	unsigned char *data = (unsigned char*)pixels;
 
-	if( internalformat == GL_RGB && format == GL_RGBA ) // strip alpha from texture
+	if( pixels && internalformat == GL_RGB && format == GL_RGBA ) // strip alpha from texture
 	{
 		unsigned char *in = data, *out;
 		int i = 0, size = width * height * 4;
@@ -1324,7 +1322,7 @@ void glScalef( GLfloat x, GLfloat y, GLfloat z )
 	glEsImpl->glScalef( x, y, z );
 }
 
-void glDepthRange( GLclampf zNear, GLclampf zFar )
+void glDepthRange( GLclampd zNear, GLclampd zFar )
 {
 	if ( ( nanoglState.depth_range_near == zNear ) && ( nanoglState.depth_range_far == zFar ) )
 	{
@@ -1383,7 +1381,7 @@ void glCullFace( GLenum mode )
 	glEsImpl->glCullFace( mode );
 }
 
-void glFrustum( GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar )
+void glFrustum( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar )
 {
 	FlushOnStateChange( );
 	glEsImpl->glFrustumf( left, right, bottom, top, zNear, zFar );
@@ -1757,6 +1755,37 @@ void glActiveTexture( GLenum texture )
 	activetmu = texture;
 }
 
+void glActiveTextureARB( GLenum texture )
+{
+	if( skipnanogl )
+	{
+		glEsImpl->glActiveTexture( texture );
+		return;
+	}
+	if ( activetmu == texture )
+	{
+		return;
+	}
+	if ( delayedttmuchange )
+	{
+		delayedttmuchange = GL_FALSE;
+	}
+	else
+	{
+		delayedttmuchange = GL_TRUE;
+		delayedtmutarget  = texture;
+	}
+	if ( texture == GL_TEXTURE0 )
+	{
+		activetmuState = &tmuState0;
+	}
+	else
+	{
+		activetmuState = &tmuState1;
+	}
+	activetmu = texture;
+}
+
 void glClientActiveTexture( GLenum texture )
 {
 	if( skipnanogl )
@@ -1766,6 +1795,16 @@ void glClientActiveTexture( GLenum texture )
 	}
 	clientactivetmu = texture;
 }
+void glClientActiveTextureARB( GLenum texture )
+{
+	if( skipnanogl )
+	{
+		glEsImpl->glClientActiveTexture( texture );
+		return;
+	}
+	clientactivetmu = texture;
+}
+
 
 void glPolygonMode( GLenum face, GLenum mode )
 {
@@ -1777,7 +1816,7 @@ void glDeleteTextures( GLsizei n, const GLuint *textures )
 	glEsImpl->glDeleteTextures( n, textures );
 }
 
-void glClearDepth( GLclampf depth )
+void glClearDepth( GLclampd depth )
 {
 	FlushOnStateChange( );
 	glEsImpl->glClearDepthf( depth );
@@ -1817,12 +1856,18 @@ void glCallList( GLuint list )
 }
 void glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha )
 {
+	FlushOnStateChange( );
+	glEsImpl->glColorMask( red, green, blue, alpha );	
 }
 void glStencilFunc( GLenum func, GLint ref, GLuint mask )
 {
+	FlushOnStateChange( );
+	glEsImpl->glStencilFunc( func, ref, mask );	
 }
 void glStencilOp( GLenum fail, GLenum zfail, GLenum zpass )
 {
+	FlushOnStateChange( );
+	glEsImpl->glStencilOp( fail, zfail, zpass );
 }
 
 struct ptrstate vertex_array;
@@ -1872,6 +1917,9 @@ void glDrawElements( GLenum mode, GLsizei count, GLenum type, const GLvoid *indi
 		else
 		{
 			glEsImpl->glDisableClientState( GL_COLOR_ARRAY );
+			glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+					currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
+
 		}
 		glEsImpl->glColorPointer( tmuState0.color_array.size,
 		                          tmuState0.color_array.type,
@@ -2148,9 +2196,13 @@ void glPolygonOffset( GLfloat factor, GLfloat units )
 }
 void glStencilMask( GLuint mask )
 {
+	FlushOnStateChange( );
+	glEsImpl->glStencilMask( mask );
 }
 void glClearStencil( GLint s )
 {
+	FlushOnStateChange( );
+	glEsImpl->glClearStencil( s );
 }
 
 #if defined( __MULTITEXTURE_SUPPORT__ )
@@ -2189,6 +2241,12 @@ void glPixelStorei( GLenum pname, GLint param )
 	glEsImpl->glPixelStorei( pname, param );
 }
 
+void glFogi( GLenum pname, GLint param )
+{
+	FlushOnStateChange( );
+	glEsImpl->glFogf( pname, param );
+}
+
 void glFogf( GLenum pname, GLfloat param )
 {
 	FlushOnStateChange( );
@@ -2338,6 +2396,9 @@ void glDrawArrays( GLenum mode, GLint first, GLsizei count )
 		else
 		{
 			glEsImpl->glDisableClientState( GL_COLOR_ARRAY );
+			glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f,
+					currentVertexAttrib.blue/255.0f, currentVertexAttrib.alpha/255.0f );
+
 		}
 		glEsImpl->glColorPointer( tmuState0.color_array.size,
 		                          tmuState0.color_array.type,