From 6c257269e0509ea9313e5a7b705d7f902761ac16 Mon Sep 17 00:00:00 2001 From: mledour Date: Tue, 2 Jul 2024 12:06:18 +0200 Subject: [PATCH] fix: oculus hook and cmake --- CMakeLists.txt | 6 +++++- src/oculus/oculus_hooks.cpp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38947b3..5469658 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,10 +119,14 @@ set_compute_shader(src/cas/cas.upscale.hlsl "shader_cas_upscale.h" "g_CASUpscale set(HRM_FILES src/hrm/hidden_radial_mask.hlsl src/hrm/fullscreen_tri.vert.hlsl + src/hrm/radial_density_mask.frag.hlsl + src/hrm/reconstruction.compute.hlsl ) source_group("hrm" FILES ${HRM_FILES}) set_pixel_shader(src/hrm/hidden_radial_mask.hlsl "shader_hrm_mask.h" "g_HRM_MaskShader") set_vertex_shader(src/hrm/fullscreen_tri.vert.hlsl "shader_hrm_fullscreen_tri.h" "g_HRM_FullscreenTriShader") +set_pixel_shader(src/hrm/radial_density_mask.frag.hlsl "shader_rdm_mask.h" "g_RDM_MaskShader") +set_compute_shader(src/hrm/reconstruction.compute.hlsl "shader_rdm_reconstruction.h" "g_RDM_ReconstructionShader") set(MAIN_FILES src/config.h @@ -184,4 +188,4 @@ set_target_properties(vrperfkit PROPERTIES OUTPUT_NAME "dxgi") target_link_libraries(vrperfkit minhook yaml-cpp dxguid ${NVAPI_LIB}) string(REPLACE "/Ob2" "/Ob3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -message(CMAKE_CXX_FLAGS_RELEASE="${CMAKE_CXX_FLAGS_RELEASE}") \ No newline at end of file +message(CMAKE_CXX_FLAGS_RELEASE="${CMAKE_CXX_FLAGS_RELEASE}") diff --git a/src/oculus/oculus_hooks.cpp b/src/oculus/oculus_hooks.cpp index 463ab63..e8ab68b 100644 --- a/src/oculus/oculus_hooks.cpp +++ b/src/oculus/oculus_hooks.cpp @@ -149,9 +149,9 @@ namespace vrperfkit { } #ifdef WIN64 - std::wstring dllNames[] = { L"LibOVRRT64_1.dll", L"VirtualDesktop.LibOVRRT64_1.dll", L"LibPVRRT64_1_X.dll" }; + std::wstring dllNames[] = { L"LibOVRRTImpl64_1.dll", L"VirtualDesktop.LibOVRRT64_1.dll", L"LibPVRRT64_1_X.dll" }; #else - std::wstring dllNames[] = { L"LibOVRRT32_1.dll", L"VirtualDesktop.LibOVRRT32_1.dll", L"LibPVRRT32_1_X.dll" }; + std::wstring dllNames[] = { L"LibOVRRTImpl32_1.dll"", L"VirtualDesktop.LibOVRRT32_1.dll", L"LibPVRRT32_1_X.dll" }; #endif HMODULE handle = nullptr; for (auto dllName : dllNames) {