diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-06-28 20:06:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-06-28 20:06:44 +0300 |
commit | 272c3e45b5bd785aaed6823b9e2c9299a0da6825 (patch) | |
tree | 7c6fe3b2bf7a9efe2636c9a384d25248db78e9cf | |
parent | ba0e3f4f83adb259822f21dc861919617a4422b4 (diff) | |
download | mv-272c3e45b5bd785aaed6823b9e2c9299a0da6825.tar.gz mv-272c3e45b5bd785aaed6823b9e2c9299a0da6825.tar.bz2 mv-272c3e45b5bd785aaed6823b9e2c9299a0da6825.tar.xz mv-272c3e45b5bd785aaed6823b9e2c9299a0da6825.zip |
Remove some depricated code from modernopengl or move it to renderers.
-rw-r--r-- | src/render/graphics.cpp | 1 | ||||
-rw-r--r-- | src/render/modernopenglgraphics.cpp | 8 | ||||
-rw-r--r-- | src/render/normalopenglgraphics.cpp | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp index 5cb45e8ca..98dbf0600 100644 --- a/src/render/graphics.cpp +++ b/src/render/graphics.cpp @@ -292,7 +292,6 @@ bool Graphics::setOpenGLMode() // Setup OpenGL glViewport(0, 0, mActualWidth, mActualHeight); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); int gotDoubleBuffer = 0; SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &gotDoubleBuffer); logger->log("Using OpenGL %s double buffering.", diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index ae121be85..994a5f7a9 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -826,23 +826,15 @@ void ModernOpenGLGraphics::beginDraw() { glEnable(GL_SCISSOR_TEST); glDisable(GL_DITHER); - glDisable(GL_LIGHTING); glDisable(GL_DEPTH_TEST); - glDisable(GL_FOG); glDisable(GL_COLOR_LOGIC_OP); - glDisable(GL_COLOR_MATERIAL); glDisable(GL_STENCIL_TEST); -// glEnable(GL_TEXTURE_2D); glDisable(GL_LINE_SMOOTH); glDisable(GL_POLYGON_SMOOTH); - glShadeModel(GL_FLAT); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); #ifndef ANDROID -// glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST); -// glHint(GL_POLYGON_SMOOTH_HINT, GL_FASTEST); #ifndef __MINGW32__ glHint(GL_TEXTURE_COMPRESSION_HINT, GL_FASTEST); #endif diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 088811d3f..8d662ec98 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -1235,6 +1235,7 @@ void NormalOpenGLGraphics::beginDraw() glShadeModel(GL_FLAT); glDepthMask(GL_FALSE); + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); #ifndef ANDROID glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); |