Skip to content
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.

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

Update the macOS framework to OpenVR 1.0.16. Update documentation. #865

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build/
Binary file removed bin/osx32/libopenvr_api.dylib
Binary file not shown.
20 changes: 0 additions & 20 deletions bin/osx32/libopenvr_api.dylib.dSYM/Contents/Info.plist

This file was deleted.

Binary file not shown.
941 changes: 883 additions & 58 deletions bin/osx64/OpenVR.framework/Versions/A/Headers/openvr.h

Large diffs are not rendered by default.

1,101 changes: 1,041 additions & 60 deletions bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_api.cs

Large diffs are not rendered by default.

794 changes: 757 additions & 37 deletions bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_api.json

Large diffs are not rendered by default.

498 changes: 485 additions & 13 deletions bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_capi.h

Large diffs are not rendered by default.

989 changes: 913 additions & 76 deletions bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_driver.h

Large diffs are not rendered by default.

Binary file modified bin/osx64/OpenVR.framework/Versions/A/OpenVR
Binary file not shown.
Binary file added bin/osx64/libopenvr_api.a
Binary file not shown.
Binary file added bin/osx64/libopenvr_api.dylib
Binary file not shown.
2 changes: 1 addition & 1 deletion headers/openvr.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ enum ETextureType
TextureType_DirectX = 0, // Handle is an ID3D11Texture
TextureType_OpenGL = 1, // Handle is an OpenGL texture name or an OpenGL render buffer name, depending on submit flags
TextureType_Vulkan = 2, // Handle is a pointer to a VRVulkanTextureData_t structure
TextureType_IOSurface = 3, // Handle is a macOS cross-process-sharable IOSurfaceRef, deprecated in favor of TextureType_Metal on supported platforms
TextureType_IOSurface = 3, // Handle is a macOS cross-process-sharable IOSurfaceRef (kIOSurfaceIsGlobal must be set for SteamVR), deprecated in favor of TextureType_Metal on supported platforms
TextureType_DirectX12 = 4, // Handle is a pointer to a D3D12TextureData_t structure
TextureType_DXGISharedHandle = 5, // Handle is a HANDLE DXGI share handle, only supported for Overlay render targets.
// this texture is used directly by our renderer, so only perform atomic (copyresource or resolve) on it
Expand Down
2 changes: 1 addition & 1 deletion src/README
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ their application or redistribute the binary they build.
This is a cmake project, to build it use the version of cmake appropriate
for your platform. For example, to build on a POSIX system simply perform

cd src; mkdir _build; cd _build; cmake ..; make
mkdir build; cd build; cmake ..; make

and you will end up with the static library /src/bin/<arch>/libopenvr_api.a

Expand Down