summaryrefslogtreecommitdiff
path: root/src/render/shaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-22 14:14:34 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-22 14:14:34 +0300
commitda05d9dd98315378bdded216184294f376643191 (patch)
treeffc4b984c73c3bb68d26a1df6481634254075744 /src/render/shaders
parentec856b2026c7ceecab5f74942bb36661d7c6ae67 (diff)
downloadplus-da05d9dd98315378bdded216184294f376643191.tar.gz
plus-da05d9dd98315378bdded216184294f376643191.tar.bz2
plus-da05d9dd98315378bdded216184294f376643191.tar.xz
plus-da05d9dd98315378bdded216184294f376643191.zip
Use resource manager as global variable.
Diffstat (limited to 'src/render/shaders')
-rw-r--r--src/render/shaders/shadersmanager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index ac1ecb9e0..345093074 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -65,14 +65,13 @@ Shader *ShadersManager::createShader(const unsigned int type,
ShaderProgram *ShadersManager::createProgram(const std::string &vertex,
const std::string &fragment)
{
- ResourceManager *const resman = ResourceManager::getInstance();
Shader *const vertexShader = static_cast<Shader*>(
- resman->getShader(GL_VERTEX_SHADER, vertex));
+ resourceManager->getShader(GL_VERTEX_SHADER, vertex));
if (!vertexShader)
return nullptr;
Shader *const fragmentShader = static_cast<Shader*>(
- resman->getShader(GL_FRAGMENT_SHADER, fragment));
+ resourceManager->getShader(GL_FRAGMENT_SHADER, fragment));
if (!fragmentShader)
{