diff options
Diffstat (limited to 'src/resources/resourcemanager')
-rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 34 | ||||
-rw-r--r-- | src/resources/resourcemanager/resourcemanager.h | 6 |
2 files changed, 0 insertions, 40 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 { diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index b2e86fc8c..f0e184825 100644 --- a/src/resources/resourcemanager/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -133,12 +133,6 @@ class ResourceManager final : public MemoryCounter */ bool addResource(const std::string &idPath, Resource *const resource); -#ifdef USE_OPENGL - Resource *getShaderProgram(const std::string &vertex, - const std::string &fragment, - const bool isNewShader) A_WARN_UNUSED; -#endif - WalkLayer *getWalkLayer(const std::string &name, Map *const map); /** |