Move shader program load function from resourcemanager into separate file.

6 files changed, 121 insertions, 40 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5a374254..caea51ea2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -729,6 +729,8 @@ SET(SRCS
     resources/loaders/musicloader.h
     resources/loaders/shaderloader.cpp
     resources/loaders/shaderloader.h
+    resources/loaders/shaderprogramloader.cpp
+    resources/loaders/shaderprogramloader.h
     resources/loaders/subimageloader.cpp
     resources/loaders/subimageloader.h
     resources/loaders/subimagesetloader.cpp
@@ -1433,6 +1435,8 @@ SET(DYE_CMD_SRCS
     resources/loaders/musicloader.h
     resources/loaders/shaderloader.cpp
     resources/loaders/shaderloader.h
+    resources/loaders/shaderprogramloader.cpp
+    resources/loaders/shaderprogramloader.h
     resources/loaders/subimageloader.cpp
     resources/loaders/subimageloader.h
     resources/loaders/subimagesetloader.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index c32f79ec0..057fe1299 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -400,6 +400,8 @@ SRC += events/actionevent.h \
 	      resources/loaders/musicloader.h \
 	      resources/loaders/shaderloader.cpp \
 	      resources/loaders/shaderloader.h \
+	      resources/loaders/shaderprogramloader.cpp \
+	      resources/loaders/shaderprogramloader.h \
 	      resources/loaders/subimageloader.cpp \
 	      resources/loaders/subimageloader.h \
 	      resources/loaders/subimagesetloader.cpp \
diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp
new file mode 100644
index 000000000..eeeedc868
--- /dev/null
+++ b/src/resources/loaders/shaderprogramloader.cpp
@@ -0,0 +1,73 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef USE_OPENGL
+
+#include "logger.h"
+
+#include "utils/checkutils.h"
+
+#include "render/shaders/shaderprogram.h"
+#include "render/shaders/shadersmanager.h"
+
+#include "resources/loaders/shaderprogramloader.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
+
+#include "debug.h"
+
+namespace
+{
+    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;
+        }
+    };
+}  // namespace
+
+Resource *Loader::getShaderProgram(const std::string &vertex,
+                                   const std::string &fragment,
+                                   const bool isNewShader)
+{
+    ShaderProgramLoader rl = { vertex, fragment, isNewShader };
+    return resourceManager->get("program_" + vertex + " + " + fragment,
+        ShaderProgramLoader::load, &rl);
+}
+
+#endif  // USE_OPENGL
diff --git a/src/resources/loaders/shaderprogramloader.h b/src/resources/loaders/shaderprogramloader.h
new file mode 100644
index 000000000..ca5c2b086
--- /dev/null
+++ b/src/resources/loaders/shaderprogramloader.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_LOADERS_SHADERPROGRAMLOADER_H
+#define RESOURCES_LOADERS_SHADERPROGRAMLOADER_H
+
+#ifdef USE_OPENGL
+
+#include <string>
+
+#include "localconsts.h"
+
+class Resource;
+
+namespace Loader
+{
+    Resource *getShaderProgram(const std::string &vertex,
+                               const std::string &fragment,
+                               const bool isNewShader) A_WARN_UNUSED;
+}  // namespace Loader
+
+#endif  // USE_OPENGL
+#endif  // RESOURCES_LOADERS_SHADERPROGRAMLOADER_H
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);
 
         /**