From 870449e3ffa8625eb062292f0f8a3457fc8e4525 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 26 Dec 2013 20:26:49 -0800 Subject: [PATCH] Undo changes to glEnable/Disable --- project/src/renderer/opengl/OGLExport.cpp | 8 ++++---- project/src/renderer/opengl/OpenGLContext.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/project/src/renderer/opengl/OGLExport.cpp b/project/src/renderer/opengl/OGLExport.cpp index eacee8fca..a81469d73 100644 --- a/project/src/renderer/opengl/OGLExport.cpp +++ b/project/src/renderer/opengl/OGLExport.cpp @@ -57,9 +57,9 @@ DEFINE_PRIM(lime_gl_version,0); value lime_gl_enable(value inCap) { - #ifndef LIME_FORCE_GLES2 + //#ifndef LIME_FORCE_GLES2 glEnable(val_int(inCap)); - #endif + //#endif return alloc_null(); } DEFINE_PRIM(lime_gl_enable,1); @@ -67,9 +67,9 @@ DEFINE_PRIM(lime_gl_enable,1); value lime_gl_disable(value inCap) { - #ifndef LIME_FORCE_GLES2 + //#ifndef LIME_FORCE_GLES2 glDisable(val_int(inCap)); - #endif + //#endif return alloc_null(); } DEFINE_PRIM(lime_gl_disable,1); diff --git a/project/src/renderer/opengl/OpenGLContext.cpp b/project/src/renderer/opengl/OpenGLContext.cpp index fff49ef22..6a64e4ea2 100644 --- a/project/src/renderer/opengl/OpenGLContext.cpp +++ b/project/src/renderer/opengl/OpenGLContext.cpp @@ -92,9 +92,9 @@ namespace lime { mViewport.w = -1; SetViewport (inRect); - #ifndef LIME_FORCE_GLES2 + //#ifndef LIME_FORCE_GLES2 glEnable (GL_BLEND); - #endif + //#endif if (mAlphaMode == amPremultiplied) glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); @@ -240,12 +240,12 @@ namespace lime { void OpenGLContext::FinishBitmapRender () { - #ifndef LIME_FORCE_GLES2 + //#ifndef LIME_FORCE_GLES2 glDisable (GL_TEXTURE_2D); #ifdef LIME_DITHER glEnable (GL_DITHER); #endif - #endif + //#endif } @@ -329,9 +329,9 @@ namespace lime { void OpenGLContext::Render (const RenderState &inState, const HardwareCalls &inCalls) { - #ifndef LIME_FORCE_GLES2 + //#ifndef LIME_FORCE_GLES2 glEnable (GL_BLEND); - #endif + //#endif SetViewport (inState.mClipRect); if (mModelView != *inState.mTransform.mMatrix) { @@ -531,12 +531,12 @@ namespace lime { sgDrawCount++; glDrawArrays (sgOpenglType[draw.mPrimType], draw.mFirst, draw.mCount); - #ifndef LIME_FORCE_GLES2 + //#ifndef LIME_FORCE_GLES2 #ifdef LIME_DITHER if (boundTexture && !draw.mBitmapSmooth) glEnable (GL_DITHER); #endif - #endif + //#endif }