From 6e83f27c9e138e632223f467e9b36a69578f316e Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 28 Apr 2017 10:38:57 +0100
Subject: [PATCH] Remove glslang warning disable as override is fully supported
 on VS2015

---
 renderdoc/driver/shaders/spirv/spirv_common.cpp      | 4 ----
 renderdoc/driver/shaders/spirv/spirv_compile.cpp     | 4 ----
 renderdoc/driver/shaders/spirv/spirv_disassemble.cpp | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/renderdoc/driver/shaders/spirv/spirv_common.cpp b/renderdoc/driver/shaders/spirv/spirv_common.cpp
index d07200208..e71771ed3 100644
--- a/renderdoc/driver/shaders/spirv/spirv_common.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_common.cpp
@@ -28,10 +28,6 @@
 #undef min
 #undef max
 
-#if ENABLED(RDOC_MSVS)
-#pragma warning(disable : 4481)    // nonstandard extension used: override specifier 'override'
-#endif
-
 #include "3rdparty/glslang/glslang/Public/ShaderLang.h"
 
 static bool inited = false;
diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
index 5a1827b88..a85e1e2b2 100644
--- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
@@ -28,10 +28,6 @@
 #undef min
 #undef max
 
-#if ENABLED(RDOC_MSVS)
-#pragma warning(disable : 4481)    // nonstandard extension used: override specifier 'override'
-#endif
-
 #include "3rdparty/glslang/SPIRV/GlslangToSpv.h"
 #include "3rdparty/glslang/glslang/Public/ShaderLang.h"
 
diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
index cb3094a12..c4d21b9eb 100644
--- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
@@ -36,10 +36,6 @@ using std::make_pair;
 #undef min
 #undef max
 
-#if ENABLED(RDOC_MSVS)
-#pragma warning(disable : 4481)    // nonstandard extension used: override specifier 'override'
-#endif
-
 #include "3rdparty/glslang/SPIRV/GLSL.std.450.h"
 #include "3rdparty/glslang/SPIRV/spirv.hpp"
 #include "3rdparty/glslang/glslang/Public/ShaderLang.h"