diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-26 18:41:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-26 18:49:16 +0300 |
| commit | 142177b927df3eca428fc5f3274af7eed1b25bcc (patch) | |
| tree | b1bda6bd0b31cc56fd87e209efbafa32b9b19988 /src/render/shaders | |
| parent | afc144cfe396f10eea5b160c711eec4b20ae00c3 (diff) | |
| download | plus-142177b927df3eca428fc5f3274af7eed1b25bcc.tar.gz plus-142177b927df3eca428fc5f3274af7eed1b25bcc.tar.bz2 plus-142177b927df3eca428fc5f3274af7eed1b25bcc.tar.xz plus-142177b927df3eca428fc5f3274af7eed1b25bcc.zip | |
Move shader load function from resourcemanager into separate file.
Diffstat (limited to 'src/render/shaders')
| -rw-r--r-- | src/render/shaders/shadersmanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index 2138df1f5..f40e570a2 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -33,6 +33,8 @@ #include "render/shaders/shader.h" #include "render/shaders/shaderprogram.h" +#include "resources/loaders/shaderloader.h" + #include "resources/resourcemanager/resourcemanager.h" #include "utils/files.h" @@ -70,12 +72,12 @@ ShaderProgram *ShadersManager::createProgram(const std::string &vertex, const bool isNewShader) { Shader *const vertexShader = static_cast<Shader*>( - resourceManager->getShader(GL_VERTEX_SHADER, vertex)); + Loader::getShader(GL_VERTEX_SHADER, vertex)); if (!vertexShader) return nullptr; Shader *const fragmentShader = static_cast<Shader*>( - resourceManager->getShader(GL_FRAGMENT_SHADER, fragment)); + Loader::getShader(GL_FRAGMENT_SHADER, fragment)); if (!fragmentShader) { |