summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager/resourcemanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-26 19:04:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-26 19:04:51 +0300
commit5663e39eba8979228e252d76fba676586c4f862f (patch)
tree27394a79fe31c273fb25bcd224b0b9adbddbc33c /src/resources/resourcemanager/resourcemanager.cpp
parent142177b927df3eca428fc5f3274af7eed1b25bcc (diff)
downloadplus-5663e39eba8979228e252d76fba676586c4f862f.tar.gz
plus-5663e39eba8979228e252d76fba676586c4f862f.tar.bz2
plus-5663e39eba8979228e252d76fba676586c4f862f.tar.xz
plus-5663e39eba8979228e252d76fba676586c4f862f.zip
Move shader program load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/resourcemanager/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager/resourcemanager.cpp34
1 files changed, 0 insertions, 34 deletions
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 8ec6c9c59..e4a540fc3 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -527,40 +527,6 @@ Resource *ResourceManager::get(const std::string &idPath,
return resource;
}
-#ifdef USE_OPENGL
-struct ShaderProgramLoader final
-{
- const std::string vertex;
- const std::string fragment;
- const bool isNewShader;
-
- static Resource *load(const void *const v)
- {
- if (!v)
- return nullptr;
-
- const ShaderProgramLoader *const rl
- = static_cast<const ShaderProgramLoader *const>(v);
- ShaderProgram *const resource = shaders.createProgram(
- rl->vertex,
- rl->fragment,
- rl->isNewShader);
- if (!resource)
- reportAlways("Shader program creation error");
- return resource;
- }
-};
-
-Resource *ResourceManager::getShaderProgram(const std::string &vertex,
- const std::string &fragment,
- const bool isNewShader)
-{
- ShaderProgramLoader rl = { vertex, fragment, isNewShader };
- return get("program_" + vertex + " + " + fragment,
- ShaderProgramLoader::load, &rl);
-}
-#endif
-
#ifndef DYECMD
struct WalkLayerLoader final
{