summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager/resourcemanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-26 18:41:36 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-26 18:49:16 +0300
commit142177b927df3eca428fc5f3274af7eed1b25bcc (patch)
treeb1bda6bd0b31cc56fd87e209efbafa32b9b19988 /src/resources/resourcemanager/resourcemanager.cpp
parentafc144cfe396f10eea5b160c711eec4b20ae00c3 (diff)
downloadmv-142177b927df3eca428fc5f3274af7eed1b25bcc.tar.gz
mv-142177b927df3eca428fc5f3274af7eed1b25bcc.tar.bz2
mv-142177b927df3eca428fc5f3274af7eed1b25bcc.tar.xz
mv-142177b927df3eca428fc5f3274af7eed1b25bcc.zip
Move shader load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/resourcemanager/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager/resourcemanager.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 3bde069e5..8ec6c9c59 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -528,32 +528,6 @@ Resource *ResourceManager::get(const std::string &idPath,
}
#ifdef USE_OPENGL
-struct ShaderLoader final
-{
- const std::string name;
- const unsigned int type;
-
- static Resource *load(const void *const v)
- {
- if (!v)
- return nullptr;
-
- const ShaderLoader *const rl
- = static_cast<const ShaderLoader *const>(v);
- Shader *const resource = shaders.createShader(rl->type, rl->name);
- if (!resource)
- reportAlways("Shader creation error: %s", rl->name.c_str());
- return resource;
- }
-};
-
-Resource *ResourceManager::getShader(const unsigned int type,
- const std::string &name)
-{
- ShaderLoader rl = { name, type };
- return get("shader_" + name, ShaderLoader::load, &rl);
-}
-
struct ShaderProgramLoader final
{
const std::string vertex;