summaryrefslogtreecommitdiff
path: root/src/render/shaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-14 22:41:07 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-14 22:41:07 +0300
commit56d6454ba617d1dcddbbaa21e2066a7db0caee75 (patch)
tree5012e55f393db2d62b40eb64142fa4317b16c571 /src/render/shaders
parentbdec92381ef60cd027292ed63e254e8de70028d9 (diff)
downloadmanaverse-56d6454ba617d1dcddbbaa21e2066a7db0caee75.tar.gz
manaverse-56d6454ba617d1dcddbbaa21e2066a7db0caee75.tar.bz2
manaverse-56d6454ba617d1dcddbbaa21e2066a7db0caee75.tar.xz
manaverse-56d6454ba617d1dcddbbaa21e2066a7db0caee75.zip
Move some virtfs replated functions from files.cpp into virtfstools.cpp
Diffstat (limited to 'src/render/shaders')
-rw-r--r--src/render/shaders/shadersmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index 93de709f5..d4854cfe2 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -25,6 +25,8 @@
#include "configuration.h"
#include "logger.h"
+#include "utils/virtfstools.h"
+
#include "render/opengl/mgl.h"
#ifdef __native_client__
#include "render/opengl/naclglfunctions.h"
@@ -35,8 +37,6 @@
#include "resources/loaders/shaderloader.h"
-#include "utils/files.h"
-
#include "debug.h"
ShadersManager shaders;
@@ -44,7 +44,7 @@ ShadersManager shaders;
Shader *ShadersManager::createShader(const unsigned int type,
const std::string &fileName)
{
- const std::string str = Files::loadTextFileString(fileName);
+ const std::string str = VirtFs::loadTextFileString(fileName);
const char *ptrStr = str.c_str();
GLuint shaderId = mglCreateShader(type);
mglShaderSource(shaderId, 1, &ptrStr, nullptr);