From 4d76ca153c28742d63bfda0e828ead66b5e1edf5 Mon Sep 17 00:00:00 2001 From: Krzysztof Bogacki Date: Mon, 3 Feb 2025 19:56:13 +0100 Subject: [PATCH 1/3] includes: Update NVAPI headers to R570 --- external/nvapi | 2 +- version.h.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/nvapi b/external/nvapi index 67af9700..ce6d2a18 160000 --- a/external/nvapi +++ b/external/nvapi @@ -1 +1 @@ -Subproject commit 67af97007f59c248c01e520d8c8fb70e243a3240 +Subproject commit ce6d2a183f9559f717e82b80333966d19edb9c8c diff --git a/version.h.in b/version.h.in index 95e94619..4b230a91 100644 --- a/version.h.in +++ b/version.h.in @@ -1,4 +1,4 @@ #pragma once -#define NVAPI_VERSION "r565" +#define NVAPI_VERSION "r570" #define DXVK_NVAPI_VERSION "@VCS_TAG@" From ec3d761ab24166c8765d3b2f7b5f1cc0de23f1fb Mon Sep 17 00:00:00 2001 From: Krzysztof Bogacki Date: Mon, 3 Feb 2025 20:10:52 +0100 Subject: [PATCH 2/3] includes: Remove now obsolete Blackwell defines --- src/nvapi_private.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/nvapi_private.h b/src/nvapi_private.h index 3ffb4f48..1e1b81e4 100644 --- a/src/nvapi_private.h +++ b/src/nvapi_private.h @@ -55,10 +55,6 @@ #undef __NVAPI_EMPTY_SAL #include "nvapi_lite_salend.h" -// TODO: Remove those once they are part of NVAPI headers -#define NV_GPU_ARCHITECTURE_GB200 (NV_GPU_ARCHITECTURE_ID)0x000001B0 -#define NV_GPU_ARCH_IMPLEMENTATION_GB202 (NV_GPU_ARCH_IMPLEMENTATION_ID)0x00000002 - #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ From 308edc2c96e9bed7a12671fc047e5d0b0a14648e Mon Sep 17 00:00:00 2001 From: Krzysztof Bogacki Date: Mon, 3 Feb 2025 20:11:28 +0100 Subject: [PATCH 3/3] tests: Update GPU arch reporting code for post-Blackwell --- tests/nvapi_system.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/nvapi_system.cpp b/tests/nvapi_system.cpp index 21f90c6e..01b6b748 100644 --- a/tests/nvapi_system.cpp +++ b/tests/nvapi_system.cpp @@ -55,8 +55,8 @@ static std::string ToGpuArchitecture(NV_GPU_ARCHITECTURE_ID id) { case NV_GPU_ARCHITECTURE_GF110: return "Fermi"; default: - if (id > NV_GPU_ARCHITECTURE_AD100) - return "Post-Ada"; + if (id > NV_GPU_ARCHITECTURE_GB200) + return "Post-Blackwell"; else return "Pre-Fermi"; }