Skip to content

fix: oculus hook and cmake #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: oculus hook and cmake #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}")
message(CMAKE_CXX_FLAGS_RELEASE="${CMAKE_CXX_FLAGS_RELEASE}")
4 changes: 2 additions & 2 deletions src/oculus/oculus_hooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down