diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
index 144974895..f867dd1c8 100644
--- a/qrenderdoc/CMakeLists.txt
+++ b/qrenderdoc/CMakeLists.txt
@@ -211,6 +211,12 @@ if(CMAKE_COMPILER_IS_GNUCXX)
         "QMAKE_CXXFLAGS+=-Wno-unknown-warning -Wno-cast-function-type -Wno-stringop-truncation\n")
 endif()
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    file(APPEND
+        ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
+        "QMAKE_CXXFLAGS+=-Wno-shadow\n")
+endif()
+
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9)
     file(APPEND
         ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
diff --git a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
index a5dc39c2a..a96664188 100644
--- a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
+++ b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
@@ -17,7 +17,7 @@ set(MODULE_DEFINES
     PRIVATE -DRENDERDOC_PLATFORM_LINUX)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-unused-private-field")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-unused-private-field -Wno-shadow")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
index 99ce9877f..97282180c 100644
--- a/renderdoc/CMakeLists.txt
+++ b/renderdoc/CMakeLists.txt
@@ -400,7 +400,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR APPLE)
     # -Wno-unused-lambda-capture available
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         set_property(SOURCE 3rdparty/jpeg-compressor/jpgd.cpp
-            APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unreachable-code-break -Wno-implicit-fallthrough")
+            APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unreachable-code-break -Wno-implicit-fallthrough -Wno-shadow")
 
         # Only clang has this warning. Fixing it in this file causes a compile error on windows
         set_source_files_properties(os/os_specific.cpp
diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt
index 68229cd36..759ed7c00 100644
--- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
@@ -128,7 +128,14 @@ endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set_property(SOURCE ${glslang_sources}
-        APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unknown-warning-option")
+        APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unknown-warning-option -Wno-shadow")
+
+    set_property(SOURCE 
+        spirv_debug.cpp
+        spirv_debug_glsl450.cpp
+        spirv_debug_setup.cpp
+        spirv_processor.cpp
+        APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow")
 
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9)
         set_property(SOURCE ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp
diff --git a/renderdoc/driver/vulkan/CMakeLists.txt b/renderdoc/driver/vulkan/CMakeLists.txt
index aa1195d90..7f3aab528 100644
--- a/renderdoc/driver/vulkan/CMakeLists.txt
+++ b/renderdoc/driver/vulkan/CMakeLists.txt
@@ -84,6 +84,11 @@ endif()
 # they can set this variable to make sure it stays local
 set(VULKAN_LAYER_FOLDER ${VULKAN_LAYER_FOLDER_DEFAULT} CACHE PATH "Path to install the vulkan layer file")
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set_property(SOURCE vk_shaderdebug.cpp
+        APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow")
+endif()
+
 if(ANDROID)
     list(APPEND sources vk_posix.cpp vk_android.cpp vk_layer_android.cpp)
     list(APPEND definitions PRIVATE -DVK_USE_PLATFORM_ANDROID_KHR)
diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt
index 97e235a89..a5555bf41 100644
--- a/renderdoccmd/CMakeLists.txt
+++ b/renderdoccmd/CMakeLists.txt
@@ -15,6 +15,8 @@ endif()
 if(APPLE)
     list(APPEND sources renderdoccmd_apple.cpp apple/cocoa_window.mm)
 
+    set_property(SOURCE renderdoccmd_apple.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow")
+
     find_library(COCOA_LIBRARY Cocoa)
     list(APPEND libraries PRIVATE ${COCOA_LIBRARY})
 
@@ -34,6 +36,11 @@ elseif(ANDROID)
 
     set_source_files_properties(renderdoccmd.cpp PROPERTIES COMPILE_FLAGS "-fexceptions -frtti")
     set_source_files_properties(renderdoccmd_android.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set_property(SOURCE renderdoccmd_android.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow")
+endif()
+
 elseif(ENABLE_GGP)
     list(APPEND sources renderdoccmd_ggp.cpp)
     find_library(GGP_LIBRARY ggp)
@@ -42,6 +49,10 @@ elseif(ENABLE_GGP)
 elseif(UNIX)
     list(APPEND sources renderdoccmd_linux.cpp)
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set_property(SOURCE renderdoccmd_linux.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow")
+endif()
+
     if(ENABLE_XLIB)
         list(APPEND libraries PRIVATE -lX11)
     endif()
@@ -76,6 +87,10 @@ else()
     add_executable(renderdoccmd ${sources})
 endif()
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set_property(SOURCE renderdoccmd.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow")
+endif()
+
 target_include_directories(renderdoccmd ${includes})
 target_link_libraries(renderdoccmd ${libraries})