From 8771171f63a08b692a74c7a03ad5089620ff3b54 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 4 Feb 2018 15:49:53 +0100
Subject: [PATCH] (glslang) Compatibility tweaks for MSVC 2010 compatibility

---
 deps/glslang/glslang.cpp                      | 2 +-
 deps/glslang/glslang/hlsl/hlslParseHelper.cpp | 4 ++--
 gfx/drivers/vulkan.c                          | 3 ++-
 gfx/drivers_shader/glslang_util.h             | 7 ++++++-
 griffin/griffin_glslang.cpp                   | 3 +++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/deps/glslang/glslang.cpp b/deps/glslang/glslang.cpp
index 4a7eda479d..a90b47c5f6 100644
--- a/deps/glslang/glslang.cpp
+++ b/deps/glslang/glslang.cpp
@@ -363,7 +363,7 @@ bool glslang::compile_spirv(const string &source, Stage stage, std::vector<uint3
             messages, &msg, forbid_include))
    {
       fprintf(stderr, "%s\n", msg.c_str());
-      return {};
+      return false;
    }
 
    if (!shader.parse(&process.GetResources(), 100, false, messages))
diff --git a/deps/glslang/glslang/hlsl/hlslParseHelper.cpp b/deps/glslang/glslang/hlsl/hlslParseHelper.cpp
index 54cd10fcc6..0239f2c41e 100755
--- a/deps/glslang/glslang/hlsl/hlslParseHelper.cpp
+++ b/deps/glslang/glslang/hlsl/hlslParseHelper.cpp
@@ -887,8 +887,8 @@ void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable)
     const TType& type = variable.getType();
 
     // emplace gives back a pair whose .first is an iterator to the item...
-    auto entry = flattenMap.emplace(variable.getUniqueId(), 
-                                    TFlattenData(type.getQualifier().layoutBinding));
+   auto entry = flattenMap.emplace(std::pair<int, TFlattenData>(variable.getUniqueId(), 
+                                    TFlattenData(type.getQualifier().layoutBinding)));
         
     // ... and the item is a map pair, so first->second is the TFlattenData itself.
     flatten(loc, variable, type, entry.first->second, "");
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index afb5d0db8e..4351f5562d 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -1290,8 +1290,9 @@ static bool vulkan_alive(void *data)
 
 static bool vulkan_suppress_screensaver(void *data, bool enable)
 {
-   (void)data;
    bool enabled = enable;
+   (void)data;
+
    return video_context_driver_suppress_screensaver(&enabled);
 }
 
diff --git a/gfx/drivers_shader/glslang_util.h b/gfx/drivers_shader/glslang_util.h
index 366009e2b0..006fadc490 100644
--- a/gfx/drivers_shader/glslang_util.h
+++ b/gfx/drivers_shader/glslang_util.h
@@ -88,7 +88,12 @@ struct glslang_meta
 {
    std::vector<glslang_parameter> parameters;
    std::string name;
-   glslang_format rt_format = SLANG_FORMAT_UNKNOWN;
+   glslang_format rt_format;
+
+   glslang_meta()
+   {
+	   rt_format = SLANG_FORMAT_UNKNOWN;
+   }
 };
 
 struct glslang_output
diff --git a/griffin/griffin_glslang.cpp b/griffin/griffin_glslang.cpp
index 31f0a09b0f..44c33866d6 100644
--- a/griffin/griffin_glslang.cpp
+++ b/griffin/griffin_glslang.cpp
@@ -2,6 +2,9 @@
 #ifdef WANT_GLSLANG
 #ifdef _MSC_VER
 #include <compat/msvc.h>
+#ifdef strtoull
+#undef strtoull
+#endif
 #endif
 
 #include "../deps/glslang/glslang.cpp"