diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
index 6d16a17d2..195c9be40 100644
--- a/qrenderdoc/CMakeLists.txt
+++ b/qrenderdoc/CMakeLists.txt
@@ -224,12 +224,18 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     file(APPEND
         ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
         "QMAKE_CXXFLAGS+=-Wno-shadow -Wno-shorten-64-to-32\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
-        "QMAKE_CXXFLAGS+=-Wno-comma\n")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9)
+        file(APPEND
+            ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
+            "QMAKE_CXXFLAGS+=-Wno-comma\n")
+    endif()
+
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19)
+        file(APPEND
+            ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
+            "QMAKE_CXXFLAGS+=-Wno-cast-function-type\n")
+    endif()
 endif()
 
 
diff --git a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
index 749358c2f..085a920d0 100644
--- a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
+++ b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
@@ -10,6 +10,10 @@ set(MODULE_DEFINES
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-unused-private-field -Wno-shadow -Wno-shorten-64-to-32")
+
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-cast-function-type")
+    endif()
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/renderdoc/driver/ihv/nv/official/PerfSDK/redist/include/linux-desktop-x64/nvperf_host_impl.h b/renderdoc/driver/ihv/nv/official/PerfSDK/redist/include/linux-desktop-x64/nvperf_host_impl.h
index 0eb82725d..d4b02181b 100644
--- a/renderdoc/driver/ihv/nv/official/PerfSDK/redist/include/linux-desktop-x64/nvperf_host_impl.h
+++ b/renderdoc/driver/ihv/nv/official/PerfSDK/redist/include/linux-desktop-x64/nvperf_host_impl.h
@@ -59,6 +59,10 @@
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
 
+#if defined(__clang__) && defined(__GNUC__) && (__clang_major__ >= 19)
+#pragma clang diagnostic ignored "-Wcast-function-type"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif