From 6efef691c7e4a92f464b8355e306e549c8ad7c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinar=20S=C3=B8pler?= Date: Sun, 2 Feb 2025 23:05:13 +0100 Subject: [PATCH] nvofapi: Only export used symbols --- src/meson.build | 1 + src/nvofapi64.def | 7 +++++++ src/nvofapi_cuda.cpp | 2 +- src/nvofapi_d3d11.cpp | 2 +- src/nvofapi_d3d12.cpp | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 src/nvofapi64.def diff --git a/src/meson.build b/src/meson.build index f0bc6836..5206a93b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -63,5 +63,6 @@ if dxvk_cpu_family == 'x86_64' name_prefix : '', dependencies : [ lib_version ], include_directories : [ nvapi_headers, vk_headers ], + vs_module_defs : target_name+'.def', install : true) endif diff --git a/src/nvofapi64.def b/src/nvofapi64.def new file mode 100644 index 00000000..5bb15185 --- /dev/null +++ b/src/nvofapi64.def @@ -0,0 +1,7 @@ +LIBRARY nvofapi.dll +EXPORTS + NvOFAPICreateInstanceCuda @1 + NvOFAPICreateInstanceD3D11 @2 + NvOFAPICreateInstanceD3D12 @3 + NvOFAPICreateInstanceVk @4 + NvOFGetMaxSupportedApiVersion @5 diff --git a/src/nvofapi_cuda.cpp b/src/nvofapi_cuda.cpp index eeaeae34..ffd61b0f 100644 --- a/src/nvofapi_cuda.cpp +++ b/src/nvofapi_cuda.cpp @@ -6,7 +6,7 @@ extern "C" { using namespace dxvk; - NV_OF_STATUS __cdecl NvOFAPICreateInstanceCuda(uint32_t apiVer, void* functionList) { + NV_OF_STATUS NVOFAPI NvOFAPICreateInstanceCuda(uint32_t apiVer, void* functionList) { constexpr auto n = __func__; if (log::tracing()) diff --git a/src/nvofapi_d3d11.cpp b/src/nvofapi_d3d11.cpp index 300b9267..b851d5f5 100644 --- a/src/nvofapi_d3d11.cpp +++ b/src/nvofapi_d3d11.cpp @@ -6,7 +6,7 @@ extern "C" { using namespace dxvk; - NV_OF_STATUS __cdecl NvOFAPICreateInstanceD3D11(uint32_t apiVer, NV_OF_D3D11_API_FUNCTION_LIST* functionList) { + NV_OF_STATUS NVOFAPI NvOFAPICreateInstanceD3D11(uint32_t apiVer, NV_OF_D3D11_API_FUNCTION_LIST* functionList) { constexpr auto n = __func__; if (log::tracing()) diff --git a/src/nvofapi_d3d12.cpp b/src/nvofapi_d3d12.cpp index 67c747c0..e03d6b22 100644 --- a/src/nvofapi_d3d12.cpp +++ b/src/nvofapi_d3d12.cpp @@ -126,7 +126,7 @@ extern "C" { } // ETBLs - NV_OF_STATUS __stdcall NvOFAPICreateInstanceD3D12(uint32_t apiVer, NV_OF_D3D12_API_FUNCTION_LIST* functionList) { + NV_OF_STATUS NVOFAPI NvOFAPICreateInstanceD3D12(uint32_t apiVer, NV_OF_D3D12_API_FUNCTION_LIST* functionList) { uint32_t apiVerMajor = (apiVer & 0xfffffff0) >> 4; uint32_t apiVerMinor = (apiVer & 0xf); constexpr auto n = __func__;