From 56d6454ba617d1dcddbbaa21e2066a7db0caee75 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 14 Feb 2017 22:41:07 +0300 Subject: Move some virtfs replated functions from files.cpp into virtfstools.cpp --- src/render/shaders/shadersmanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/render') 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); -- cgit v1.2.3-60-g2f50