summaryrefslogtreecommitdiff
path: root/src/render/shaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-06-11 23:44:25 +0300
committerAndrei Karas <akaras@inbox.ru>2014-06-12 00:47:24 +0300
commit8e1fc2522ee907da5fc3e65691990fd608539a72 (patch)
tree888bdab76dc75120a68c4213c204d0ce13da6f61 /src/render/shaders
parent41836760fa59abc74098aed7450b4858dc288e56 (diff)
downloadplus-8e1fc2522ee907da5fc3e65691990fd608539a72.tar.gz
plus-8e1fc2522ee907da5fc3e65691990fd608539a72.tar.bz2
plus-8e1fc2522ee907da5fc3e65691990fd608539a72.tar.xz
plus-8e1fc2522ee907da5fc3e65691990fd608539a72.zip
Use only one shader program for all drawing.
Diffstat (limited to 'src/render/shaders')
-rw-r--r--src/render/shaders/shadersmanager.cpp6
-rw-r--r--src/render/shaders/shadersmanager.h2
2 files changed, 0 insertions, 8 deletions
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index 8a1072deb..2c37f56d5 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -119,10 +119,4 @@ ShaderProgram *ShadersManager::getSimpleProgram()
dir + paths.getStringValue("simpleFragmentShader"));
}
-ShaderProgram *ShadersManager::getTextureProgram()
-{
- const std::string dir = paths.getStringValue("shaders");
- return createProgram(dir + paths.getStringValue("textureVertexShader"),
- dir + paths.getStringValue("textureFragmentShader"));
-}
#endif
diff --git a/src/render/shaders/shadersmanager.h b/src/render/shaders/shadersmanager.h
index b525d18e1..50e714aba 100644
--- a/src/render/shaders/shadersmanager.h
+++ b/src/render/shaders/shadersmanager.h
@@ -41,8 +41,6 @@ class ShadersManager final
A_WARN_UNUSED;
ShaderProgram *getSimpleProgram();
-
- ShaderProgram *getTextureProgram();
};
extern ShadersManager shaders;