Update upstream dxvk-nvapi

SveSop · Jun 5, 2024 · e8ab822 · e8ab822
1 parent 220a160
commit e8ab822
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -38,6 +38,14 @@ You can install symlinks and dll-overrides to the libraries in your wineprefix l
 To uninstall:  
 `WINEPREFIX=/your/wine/prefix ./setup_nvlibs.sh uninstall`  
 
+### DXVK-NVAPI
+Check out README file usage of DXVK-NVAPI.  
+[https://github.com/SveSop/dxvk-nvapi/blob/master/README.md](https://github.com/SveSop/dxvk-nvapi/blob/master/README.md)  
+Typical log level usage:  
+`DXVK_NVAPI_LOG_LEVEL=none` (Default) No output.  
+`DXVK_NVAPI_LOG_LEVEL=info` Informational output of function calls.  
+`DXVK_NVAPI_LOG_LEVEL=trace` Detailed debug information.  
+
 ### WINE-NVML  
 In order to use DXVK-NVAPI (NvAPI) with some extra GPU information (temps and the likes)  
 you need to copy the NVML binaries to your wine binaries folder. You can do this by  

diff --git a/dxvk-nvapi b/dxvk-nvapi
+1 −1		README.md
+0 −1		build-win32.txt
+0 −1		build-win64.txt
+13 −13		inc/nvapi.h
+0 −7		meson.build
+3 −3		src/d3d/lfx.cpp
+1 −1		src/d3d/nvapi_d3d_instance.cpp
+3 −3		src/d3d12/nvapi_d3d12_device.cpp
+1 −3		src/meson.build
+78 −61		src/nvapi.cpp
+95 −36		src/nvapi_d3d.cpp
+106 −38		src/nvapi_d3d11.cpp
+111 −46		src/nvapi_d3d12.cpp
+14 −2		src/nvapi_disp.cpp
+45 −4		src/nvapi_drs.cpp
+172 −52		src/nvapi_gpu.cpp
+4 −4		src/nvapi_interface.cpp
+6 −1		src/nvapi_mosaic.cpp
+12 −0		src/nvapi_sys.cpp
+3 −3		src/resource_factory.cpp
+7 −7		src/sysinfo/nvapi_adapter.cpp
+1 −1		src/sysinfo/nvapi_adapter_registry.cpp
+1 −1		src/sysinfo/nvapi_output.cpp
+4 −4		src/sysinfo/nvml.cpp
+5 −5		src/util/util_env.cpp
+27 −0		src/util/util_latency_marker_code.h
+35 −6		src/util/util_log.cpp
+77 −1		src/util/util_log.h
+2 −1		src/util/util_op_code.h
+30 −35		src/util/util_statuscode.h
+6 −6		src/util/util_string.h
+0 −31		src/version.rc
+5 −3		tests/nvapi_d3d11.cpp
+34 −19		tests/nvapi_d3d12.cpp
+2 −15		tests/nvapi_sysinfo.cpp
+31 −2		tests/nvapi_sysinfo_topo.cpp
+23 −0		tests/util.cpp