diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-06-11 23:44:25 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-06-12 00:47:24 +0300 |
commit | 8e1fc2522ee907da5fc3e65691990fd608539a72 (patch) | |
tree | 888bdab76dc75120a68c4213c204d0ce13da6f61 /src/render/modernopenglgraphics.h | |
parent | 41836760fa59abc74098aed7450b4858dc288e56 (diff) | |
download | manaverse-8e1fc2522ee907da5fc3e65691990fd608539a72.tar.gz manaverse-8e1fc2522ee907da5fc3e65691990fd608539a72.tar.bz2 manaverse-8e1fc2522ee907da5fc3e65691990fd608539a72.tar.xz manaverse-8e1fc2522ee907da5fc3e65691990fd608539a72.zip |
Use only one shader program for all drawing.
Diffstat (limited to 'src/render/modernopenglgraphics.h')
-rw-r--r-- | src/render/modernopenglgraphics.h | 14 |
1 files changed, 5 insertions, 9 deletions
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; |