Compare commits

...

4 Commits

Author SHA1 Message Date
Andrew Eikum
fbd3cfd90b update wine 2021-01-25 09:21:32 -06:00
Paul Gofman
e086f4f8ce vrclient_x64: Do not change handle in in ivrcompositor_submit_vulkan().
No Man's Sky is giving us vulkan handle in that handle. It looks like
the depth texture is not used by openvr, putting anything to this handle
does not trigger any fault or Vulkan validation error.
2021-01-25 09:21:32 -06:00
Simon McVittie
7a5dc9baed gitmodules: Consistently remove trailing slash
The forms with or without a trailing slash are interchangeable via https,
but the form with a trailing slash doesn't work if you have git configured
to always access Github repositories via ssh, using something like:

    git config --global url."git+ssh://git@github.com/".insteadOf "https://github.com/"

Signed-off-by: Simon McVittie <smcv@collabora.com>
2021-01-25 09:21:32 -06:00
Andrew Eikum
9a4c4f405e proton: Don't disable mfplay 2021-01-15 08:30:26 -06:00
4 changed files with 4 additions and 14 deletions

6
.gitmodules vendored
View File

@ -1,9 +1,9 @@
[submodule "wine"] [submodule "wine"]
path = wine path = wine
url = https://github.com/ValveSoftware/wine/ url = https://github.com/ValveSoftware/wine
[submodule "dxvk"] [submodule "dxvk"]
path = dxvk path = dxvk
url = https://github.com/ValveSoftware/dxvk/ url = https://github.com/ValveSoftware/dxvk
[submodule "openvr"] [submodule "openvr"]
path = openvr path = openvr
url = https://github.com/ValveSoftware/openvr url = https://github.com/ValveSoftware/openvr
@ -12,7 +12,7 @@
url = https://github.com/liberationfonts/liberation-fonts url = https://github.com/liberationfonts/liberation-fonts
[submodule "FAudio"] [submodule "FAudio"]
path = FAudio path = FAudio
url = https://github.com/FNA-XNA/FAudio/ url = https://github.com/FNA-XNA/FAudio
[submodule "gstreamer"] [submodule "gstreamer"]
path = gstreamer path = gstreamer
url = https://gitlab.freedesktop.org/gstreamer/gstreamer.git url = https://gitlab.freedesktop.org/gstreamer/gstreamer.git

1
proton
View File

@ -606,7 +606,6 @@ class Session:
self.dlloverrides = { self.dlloverrides = {
"steam.exe": "b", #always use our special built-in steam.exe "steam.exe": "b", #always use our special built-in steam.exe
"dotnetfx35.exe": "b", #replace the broken installer, as does Windows "dotnetfx35.exe": "b", #replace the broken installer, as does Windows
"mfplay": "n" #disable built-in mfplay
} }
self.compat_config = set() self.compat_config = set()

View File

@ -931,15 +931,6 @@ static EVRCompositorError ivrcompositor_submit_vulkan(
our_depth.texture.handle = &our_vkdata; our_depth.texture.handle = &our_vkdata;
their_vkdata = (struct VRVulkanTextureData_t *)our_depth.depth.handle;
our_depth_vkdata = *their_vkdata;
our_depth_vkdata.m_pDevice = get_native_VkDevice(our_depth_vkdata.m_pDevice);
our_depth_vkdata.m_pPhysicalDevice = get_native_VkPhysicalDevice(our_depth_vkdata.m_pPhysicalDevice);
our_depth_vkdata.m_pInstance = get_native_VkInstance(our_depth_vkdata.m_pInstance);
our_depth_vkdata.m_pQueue = get_native_VkQueue(our_depth_vkdata.m_pQueue);
our_depth.depth.handle = &our_depth_vkdata;
tex = &our_depth; tex = &our_depth;
break; break;

2
wine

@ -1 +1 @@
Subproject commit 2117f849363107537dfc954451ed96237b5b3f9d Subproject commit 0f2df7e0f3fd920b925222d96d16c3fe271dc4a9