X-Git-Url: https://deadsoftware.ru/gitweb?p=nanogl.git;a=blobdiff_plain;f=nanoWrap.cpp;h=62e37ad3382b9be144ba24a03a1b5324629a60c9;hp=41eb4dda9ebacbbba3d3194bbb89ac8f3c115311;hb=HEAD;hpb=6896ce1e5f02d51b33223b1c22aad0818c32a4d8 diff --git a/nanoWrap.cpp b/nanoWrap.cpp index 41eb4dd..62e37ad 100644 --- a/nanoWrap.cpp +++ b/nanoWrap.cpp @@ -67,9 +67,8 @@ struct nanoState GLboolean scissor_test; GLboolean stencil_test; GLboolean depthmask; - GLboolean stupidglesbug; - GLclampf depth_range_near; - GLclampf depth_range_far; + GLclampd depth_range_near; + GLclampd depth_range_far; GLenum depth_func; GLenum cullface; GLenum shademodel; @@ -114,7 +113,6 @@ static struct nanoState nanoglInitState = GL_FALSE, GL_FALSE, GL_TRUE, - GL_FALSE, 0.0f, 1.0f, GL_LESS, @@ -180,7 +178,7 @@ static struct nanotmuState tmuInitState = static struct nanotmuState *activetmuState = &tmuState0; -extern "C++" GlESInterface *glEsImpl; +extern GlESInterface *glEsImpl; static GLenum wrapperPrimitiveMode = GL_QUADS; GLboolean useTexCoordArray = GL_FALSE; @@ -248,6 +246,64 @@ static GLboolean arraysValid = GL_FALSE; static GLboolean skipnanogl; +#define STACK_ATTRIB_ENABLE_BIT_LEN (sizeof(stackAttribEnableBit) / sizeof(stackAttribEnableBit[0])) +static const GLenum stackAttribEnableBit[] = +{ + GL_ALPHA_TEST, + GL_BLEND, + GL_CLIP_PLANE0, + GL_CLIP_PLANE1, + GL_CLIP_PLANE2, + GL_CLIP_PLANE3, + GL_CLIP_PLANE4, + GL_CLIP_PLANE5, + GL_COLOR_MATERIAL, + GL_CULL_FACE, + GL_DEPTH_TEST, + GL_DITHER, + GL_FOG, + GL_LIGHT0, + GL_LIGHT1, + GL_LIGHT2, + GL_LIGHT3, + GL_LIGHT4, + GL_LIGHT5, + GL_LIGHT6, + GL_LIGHT7, + GL_LIGHTING, + GL_LINE_SMOOTH, + GL_COLOR_LOGIC_OP, + GL_MULTISAMPLE, + GL_NORMALIZE, + GL_POINT_SMOOTH, + GL_POLYGON_OFFSET_LINE, + GL_POLYGON_OFFSET_FILL, + GL_POLYGON_OFFSET_POINT, + GL_POLYGON_SMOOTH, + GL_POLYGON_STIPPLE, + GL_SAMPLE_ALPHA_TO_COVERAGE, + GL_SAMPLE_ALPHA_TO_ONE, + GL_SAMPLE_COVERAGE, + GL_SCISSOR_TEST, + GL_STENCIL_TEST, + GL_TEXTURE_1D, + GL_TEXTURE_2D, + GL_TEXTURE_GEN_S, + GL_TEXTURE_GEN_T, + GL_TEXTURE_GEN_R, + GL_TEXTURE_GEN_Q, +}; + +#define MAX_ATTRIB_STACK 16 +struct attribStore +{ + GLbitfield mask; + GLboolean enable[STACK_ATTRIB_ENABLE_BIT_LEN]; +}; + +static struct attribStore attribStack[MAX_ATTRIB_STACK]; +static int attribStackCount = 0; + void InitGLStructs( ) { ptrVertexAttribArray = vertexattribs; @@ -271,6 +327,9 @@ void InitGLStructs( ) vertexMark = 0; indexbase = 0; arraysValid = GL_FALSE; + + memset(attribStack, 0, sizeof( struct attribStore )); + attribStackCount = 0; } void ResetNanoState( ) @@ -344,6 +403,9 @@ void ResetNanoState( ) arraysValid = GL_FALSE; skipnanogl = GL_FALSE; + + memset(attribStack, 0, sizeof( struct attribStore )); + attribStackCount = 0; } void FlushOnStateChange( ) @@ -791,12 +853,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: @@ -1097,12 +1158,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: @@ -1185,23 +1245,14 @@ void glLoadIdentity( void ) } void glColor4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ) -{ - if( nanoglState.stupidglesbug ) - { - currentVertexAttrib.red = (unsigned char)ClampTo255( ( red * alpha ) * 255.0f ); - currentVertexAttrib.green = (unsigned char)ClampTo255( ( green * alpha ) * 255.0f ); - currentVertexAttrib.blue = (unsigned char)ClampTo255( ( blue * alpha ) * 255.0f ); - } - else - { - currentVertexAttrib.red = (unsigned char)ClampTo255( red * 255.0f ); - currentVertexAttrib.green = (unsigned char)ClampTo255( green * 255.0f ); - currentVertexAttrib.blue = (unsigned char)ClampTo255( blue * 255.0f ); - } +{ + currentVertexAttrib.red = (unsigned char)ClampTo255( red * 255.0f ); + currentVertexAttrib.green = (unsigned char)ClampTo255( green * 255.0f ); + currentVertexAttrib.blue = (unsigned char)ClampTo255( blue * 255.0f ); 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 @@ -1290,9 +1341,27 @@ void glTexParameterfv( GLenum target, GLenum pname, const GLfloat *params ) void glTexImage2D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels ) { - FlushOnStateChange( ); + unsigned char *data = (unsigned char*)pixels; + + if( pixels && internalformat == GL_RGB && format == GL_RGBA ) // strip alpha from texture + { + unsigned char *in = data, *out; + int i = 0, size = width * height * 4; + + data = out = (unsigned char*)malloc( size ); + + for( i = 0; i < size; i += 4, in += 4, out += 4 ) + { + memcpy( out, in, 3 ); + out[3] = 255; + } + } + internalformat = format; - glEsImpl->glTexImage2D( target, level, internalformat, width, height, border, format, type, pixels ); + glEsImpl->glTexImage2D( target, level, internalformat, width, height, border, format, type, data ); + + if( data != pixels ) + free(data); } void glDrawBuffer( GLenum /*mode*/ ) @@ -1317,7 +1386,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 ) ) { @@ -1376,7 +1445,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 ); @@ -1402,19 +1471,10 @@ void glVertex3f( GLfloat x, GLfloat y, GLfloat z ) } void glColor4fv( const GLfloat *v ) -{ - if( nanoglState.stupidglesbug ) - { - currentVertexAttrib.red = (unsigned char)ClampTo255( ( v[0] * v[3] ) * 255.0f ); - currentVertexAttrib.green = (unsigned char)ClampTo255( ( v[1] * v[3] ) * 255.0f ); - currentVertexAttrib.blue = (unsigned char)ClampTo255( ( v[2] * v[3] ) * 255.0f ); - } - else - { - currentVertexAttrib.red = (unsigned char)ClampTo255( v[0] * 255.0f ); - currentVertexAttrib.green = (unsigned char)ClampTo255( v[1] * 255.0f ); - currentVertexAttrib.blue = (unsigned char)ClampTo255( v[2] * 255.0f ); - } +{ + currentVertexAttrib.red = (unsigned char)ClampTo255( v[0] * 255.0f ); + currentVertexAttrib.green = (unsigned char)ClampTo255( v[1] * 255.0f ); + currentVertexAttrib.blue = (unsigned char)ClampTo255( v[2] * 255.0f ); currentVertexAttrib.alpha = (unsigned char)ClampTo255( v[3] * 255.0f ); if( skipnanogl ) glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f, @@ -1435,18 +1495,9 @@ void glColor3ubv( const GLubyte *v ) void glColor4ubv( const GLubyte *v ) { //*((unsigned int*)(¤tVertexAttrib.red)) = *((unsigned int*)(v)); - if( nanoglState.stupidglesbug ) - { - currentVertexAttrib.red = (unsigned char)ClampTo255( v[0] * v[3] / 255.0f ); - currentVertexAttrib.green = (unsigned char)ClampTo255( v[1] * v[3] / 255.0f ); - currentVertexAttrib.blue = (unsigned char)ClampTo255( v[2] * v[3] / 255.0f ); - } - else - { - currentVertexAttrib.red = v[0]; - currentVertexAttrib.green = v[1]; - currentVertexAttrib.blue = v[2]; - } + currentVertexAttrib.red = v[0]; + currentVertexAttrib.green = v[1]; + currentVertexAttrib.blue = v[2]; currentVertexAttrib.alpha = v[3]; if( skipnanogl ) glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f, @@ -1468,18 +1519,9 @@ void glColor3fv( const GLfloat *v ) void glColor4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) { - if( nanoglState.stupidglesbug ) - { - currentVertexAttrib.red = (unsigned char)ClampTo255( red * alpha / 255.0f ); - currentVertexAttrib.green = (unsigned char)ClampTo255( green * alpha / 255.0f ); - currentVertexAttrib.blue = (unsigned char)ClampTo255( blue * alpha / 255.0f ); - } - else - { - currentVertexAttrib.red = red; - currentVertexAttrib.green = green; - currentVertexAttrib.blue = blue; - } + currentVertexAttrib.red = red; + currentVertexAttrib.green = green; + currentVertexAttrib.blue = blue; currentVertexAttrib.alpha = alpha; if( skipnanogl ) glEsImpl->glColor4f( currentVertexAttrib.red/255.0f, currentVertexAttrib.green/255.0f, @@ -1573,15 +1615,7 @@ void glBlendFunc( GLenum sfactor, GLenum dfactor ) { return; } - - if( sfactor == GL_SRC_ALPHA && dfactor == GL_ONE ) - { - sfactor = GL_ONE; // workaround gles bug - nanoglState.stupidglesbug = GL_TRUE; - } - else - nanoglState.stupidglesbug = GL_FALSE; - + nanoglState.sfactor = sfactor; nanoglState.dfactor = dfactor; FlushOnStateChange( ); @@ -1785,6 +1819,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 ) @@ -1794,6 +1859,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 ) { @@ -1805,7 +1880,7 @@ void glDeleteTextures( GLsizei n, const GLuint *textures ) glEsImpl->glDeleteTextures( n, textures ); } -void glClearDepth( GLclampf depth ) +void glClearDepth( GLclampd depth ) { FlushOnStateChange( ); glEsImpl->glClearDepthf( depth ); @@ -1845,12 +1920,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; @@ -1900,6 +1981,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, @@ -2176,9 +2260,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__ ) @@ -2217,6 +2305,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( ); @@ -2366,6 +2460,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, @@ -2527,4 +2624,147 @@ void glBufferDataARB( GLuint target, GLuint size, void *buffer, GLuint type ) void glBufferSubDataARB( GLuint target, GLsizei offset, GLsizei size, void *buffer ) { glEsImpl->glBufferSubData( target, offset, size, buffer ); -} \ No newline at end of file +} + +GLboolean glIsEnabled(GLenum cap) +{ + FlushOnStateChange( ); + + if( skipnanogl ) + { + return glEsImpl->glIsEnabled(cap); + } + + switch ( cap ) + { + case GL_ALPHA_TEST: + return nanoglState.alpha_test; + case GL_BLEND: + return nanoglState.blend; + case GL_COLOR_LOGIC_OP: + return nanoglState.color_logic_op; + case GL_COLOR_MATERIAL: + return nanoglState.color_material; + case GL_CULL_FACE: + return nanoglState.cull_face; + case GL_DEPTH_TEST: + return nanoglState.depth_test; + case GL_DITHER: + return nanoglState.dither; + case GL_FOG: + return nanoglState.fog; + case GL_LIGHT0: + return nanoglState.light0; + case GL_LIGHT1: + return nanoglState.light1; + case GL_LIGHT2: + return nanoglState.light2; + case GL_LIGHT3: + return nanoglState.light3; + case GL_LIGHT4: + return nanoglState.light4; + case GL_LIGHT5: + return nanoglState.light5; + case GL_LIGHT6: + return nanoglState.light6; + case GL_LIGHT7: + return nanoglState.light7; + case GL_LIGHTING: + return nanoglState.lighting; + case GL_LINE_SMOOTH: + return nanoglState.line_smooth; + case GL_MULTISAMPLE: + return nanoglState.multisample; + case GL_NORMALIZE: + return nanoglState.normalize; + case GL_POLYGON_OFFSET_FILL: + return nanoglState.polygon_offset_fill; + case GL_RESCALE_NORMAL: + return nanoglState.rescale_normal; + case GL_SAMPLE_ALPHA_TO_COVERAGE: + return nanoglState.sample_alpha_to_coverage; + case GL_SAMPLE_ALPHA_TO_ONE: + return nanoglState.sample_alpha_to_one; + case GL_SAMPLE_COVERAGE: + return nanoglState.sample_coverage; + case GL_SCISSOR_TEST: + return nanoglState.scissor_test; + case GL_STENCIL_TEST: + return nanoglState.stencil_test; + case GL_TEXTURE_2D: + return activetmuState->texture_2d.value; + default: + return glIsEnabled(cap); + } +} + +void glPushAttrib(GLbitfield mask) +{ + FlushOnStateChange( ); + + if( (attribStackCount < 0) || (attribStackCount > MAX_ATTRIB_STACK) ) + { + return; + } + + attribStack[attribStackCount].mask = mask; + + if( mask & GL_ENABLE_BIT ) + { + for(int i = 0; i < STACK_ATTRIB_ENABLE_BIT_LEN; i++) + { + attribStack[attribStackCount].enable[i] = glIsEnabled(stackAttribEnableBit[i]); + } + } + + if( mask & GL_COLOR_BUFFER_BIT ) + { + // TODO + } + + if( mask & GL_CURRENT_BIT ) + { + // TODO + } + + attribStackCount += 1; +} + +void glPopAttrib() +{ + FlushOnStateChange( ); + + attribStackCount -= 1; + if((attribStackCount < 0) || (attribStackCount > MAX_ATTRIB_STACK)) + { + attribStackCount += 1; + return; + } + + GLbitfield mask = attribStack[attribStackCount].mask; + + if( mask & GL_ENABLE_BIT ) + { + for(int i = 0; i < STACK_ATTRIB_ENABLE_BIT_LEN; i++) + { + if( attribStack[attribStackCount].enable[i] ) + { + glEnable(stackAttribEnableBit[i]); + } + else + { + glDisable(stackAttribEnableBit[i]); + } + } + } + + if( mask & GL_COLOR_BUFFER_BIT ) + { + // TODO + } + + if( mask & GL_CURRENT_BIT ) + { + // TODO + } +}