diff --git a/3rdparty/dxsdk/include/pix3.h b/3rdparty/dxsdk/include/pix3.h
index b69062e66..311d6c240 100644
--- a/3rdparty/dxsdk/include/pix3.h
+++ b/3rdparty/dxsdk/include/pix3.h
@@ -103,10 +103,6 @@ inline void PIXScopedEvent(UINT64, _In_ PCWSTR, ...) {}
 inline void PIXScopedEvent(void*, UINT64, _In_ PCSTR, ...) {}
 inline void PIXScopedEvent(void*, UINT64, _In_ PCWSTR, ...) {}
 
-// don't show warnings about expressions with no effect
-#pragma warning(disable:4548)
-#pragma warning(disable:4555)
-
 #endif // USE_PIX
 
 // Use these functions to specify colors to pass as metadata to a PIX event/marker API.
diff --git a/3rdparty/ocornut-imgui/imgui_draw.cpp b/3rdparty/ocornut-imgui/imgui_draw.cpp
index 5566a9749..a7a5af095 100644
--- a/3rdparty/ocornut-imgui/imgui_draw.cpp
+++ b/3rdparty/ocornut-imgui/imgui_draw.cpp
@@ -42,7 +42,9 @@
 #pragma clang diagnostic ignored "-Wfloat-equal"            // warning : comparing floating point with == or != is unsafe   // storing and comparing against same constants ok.
 #pragma clang diagnostic ignored "-Wglobal-constructors"    // warning : declaration requires a global destructor           // similar to above, not sure what the exact difference it.
 #pragma clang diagnostic ignored "-Wsign-conversion"        // warning : implicit conversion changes signedness             //
+#if __has_warning("-Wcomma")
 #pragma clang diagnostic ignored "-Wcomma"                  // warning : possible misuse of comma operator here             //
+#endif
 #if __has_warning("-Wreserved-id-macro")
 #pragma clang diagnostic ignored "-Wreserved-id-macro"      // warning : macro name is a reserved identifier                //
 #endif