From 740b10240414ae3b7c37ee21fd131ffdb296b2b9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 10 Dec 2015 02:59:18 +0300
Subject: Add function for load OpenGL ES 2 shaders.

---
 src/resources/resourcemanager.cpp | 10 +++++++---
 src/resources/resourcemanager.h   |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index f9f55ca03..bb566d9f4 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -763,6 +763,7 @@ struct ShaderProgramLoader final
 {
     const std::string vertex;
     const std::string fragment;
+    const bool isNewShader;
 
     static Resource *load(const void *const v)
     {
@@ -772,15 +773,18 @@ struct ShaderProgramLoader final
         const ShaderProgramLoader *const rl
             = static_cast<const ShaderProgramLoader *const>(v);
         ShaderProgram *const resource = shaders.createProgram(
-            rl->vertex, rl->fragment);
+            rl->vertex,
+            rl->fragment,
+            rl->isNewShader);
         return resource;
     }
 };
 
 Resource *ResourceManager::getShaderProgram(const std::string &vertex,
-                                            const std::string &fragment)
+                                            const std::string &fragment,
+                                            const bool isNewShader)
 {
-    ShaderProgramLoader rl = { vertex, fragment };
+    ShaderProgramLoader rl = { vertex, fragment, isNewShader };
     return get("program_" + vertex + " + " + fragment,
         ShaderProgramLoader::load, &rl);
 }
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 13d05f0b2..329820246 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -181,7 +181,8 @@ class ResourceManager final
                             const std::string &name) A_WARN_UNUSED;
 
         Resource *getShaderProgram(const std::string &vertex,
-                                   const std::string &fragment) A_WARN_UNUSED;
+                                   const std::string &fragment,
+                                   const bool isNewShader) A_WARN_UNUSED;
 #endif
 
         WalkLayer *getWalkLayer(const std::string &name, Map *const map);
-- 
cgit v1.2.3-70-g09d2