From 8e1fc2522ee907da5fc3e65691990fd608539a72 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 11 Jun 2014 23:44:25 +0300
Subject: Use only one shader program for all drawing.

---
 src/render/modernopenglgraphics.h | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/render/modernopenglgraphics.h')

diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h
index d9c043fc0..56e949aab 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -82,25 +82,21 @@ class ModernOpenGLGraphics final : public Graphics
 
         GLfloat *mFloatArray;
         GLfloat *mFloatArrayCached;
-        ShaderProgram *mSimpleProgram;
-        ShaderProgram *mTextureProgram;
+        ShaderProgram *mProgram;
         float mAlphaCached;
         int mVpCached;
-        bool mTexture;
 
         bool mIsByteColor;
         Color mByteColor;
         GLuint mImageCached;
         float mFloatColor;
         int mMaxVertices;
-        GLuint mSimpleProgramId;
-        GLuint mTextureProgramId;
+        GLuint mProgramId;
         GLuint mSimpleColorUniform;
-        GLint mSimplePosAttrib;
-        GLint mTexturePosAttrib;
+        GLint mPosAttrib;
         GLint mTextureColorUniform;
-        GLuint mSimpleScreenUniform;
-        GLuint mTextureScreenUniform;
+        GLuint mScreenUniform;
+        GLuint mDrawTypeUniform;
         GLuint mVao;
         GLuint mVbo;
         bool mColorAlpha;
-- 
cgit v1.2.3-60-g2f50