diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-06-10 20:26:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-06-10 20:26:24 +0300 |
| commit | 03b8fa8772ef8aadb73fb096c7ba4e257902a331 (patch) | |
| tree | 69d91219177b17eb54cdf88af12890fad65b592c /src/render | |
| parent | e26b6338465f2ca1b7e83ec715bcd7860916e56d (diff) | |
| download | manaplus-03b8fa8772ef8aadb73fb096c7ba4e257902a331.tar.gz manaplus-03b8fa8772ef8aadb73fb096c7ba4e257902a331.tar.bz2 manaplus-03b8fa8772ef8aadb73fb096c7ba4e257902a331.tar.xz manaplus-03b8fa8772ef8aadb73fb096c7ba4e257902a331.zip | |
In modernopengl use glProgramUniform.
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/modernopenglgraphics.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index 349b7870b..caa14cb33 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -667,11 +667,6 @@ void ModernOpenGLGraphics::setTexturingAndBlending(const bool enable) mglUseProgram(mTextureProgramId); mglEnableVertexAttribArray(mTexturePosAttrib); mglEnableVertexAttribArray(mTexAttrib); -/* - mglUniform2f(mTextureScreenUniform, - static_cast<float>(mWidth) / 2.0f, - static_cast<float>(mHeight) / 2.0f); -*/ } if (!mAlpha) { @@ -688,16 +683,6 @@ void ModernOpenGLGraphics::setTexturingAndBlending(const bool enable) mglDisableVertexAttribArray(mTexAttrib); mglUseProgram(mSimpleProgramId); mglEnableVertexAttribArray(mSimplePosAttrib); -/* - mglUniform2f(mSimpleScreenUniform, - static_cast<float>(mWidth) / 2.0f, - static_cast<float>(mHeight) / 2.0f); - mglUniform4f(mSimpleColorUniform, - static_cast<float>(mColor.r) / 255.0F, - static_cast<float>(mColor.g) / 255.0F, - static_cast<float>(mColor.b) / 255.0F, - static_cast<float>(mColor.a) / 255.0F); -*/ } if (mAlpha && !mColorAlpha) { |