X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=nanoWrap.cpp;h=c13aea311d72a7f902275de277d4f156227a7039;hb=3bfb0b2c9c04f5463e75b604fd11c042eb3b3ff1;hp=a30a009de2421771b32292914fa1ae480c96ed7a;hpb=51ccb8dbf05b56a5d01091ed7c5d3ec144d1d5d4;p=nanogl.git diff --git a/nanoWrap.cpp b/nanoWrap.cpp index a30a009..c13aea3 100644 --- a/nanoWrap.cpp +++ b/nanoWrap.cpp @@ -324,7 +324,9 @@ void FlushOnStateChange() if (delayedttmuchange) { delayedttmuchange = GL_FALSE; +#ifndef USE_CORE_PROFILE glEsImpl->glActiveTexture(delayedtmutarget); +#endif } if (!vertexCount) @@ -994,7 +996,11 @@ void glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) void glOrtho (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) { FlushOnStateChange(); +#ifdef USE_CORE_PROFILE + glEsImpl->glOrtho(left,right,bottom,top, zNear,zFar); +#else glEsImpl->glOrthof(left,right,bottom,top, zNear,zFar); +#endif } void glMatrixMode (GLenum mode) @@ -1071,7 +1077,11 @@ void glDepthRange(GLclampf zNear, GLclampf zFar) nanoglState.depth_range_far = zFar; } FlushOnStateChange(); +#ifdef USE_CORE_PROFILE + glEsImpl->glDepthRange(zNear, zFar); +#else glEsImpl->glDepthRangef(zNear, zFar); +#endif } void glDepthFunc (GLenum func)