Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

vrclient: Implement LoadIntoTextureD3D11_Async().

Browse Source
This commit is contained in:
Józef Kucia 2018-09-24 17:34:07 +02:00 committed by Andrew Eikum
parent b44c226242
commit cf2be60a67
5 changed files with 106 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vrclient_x64/gen_wrapper.py
View File

@ -177,6 +177,10 @@ def ivrcompositor_wait_get_poses(cppname, method):
def ivrcompositor_get_vulkan_device_extensions_required(cppname, method):
return "ivrcompositor_get_vulkan_device_extensions_required"
def ivrrendermodels_load_into_texture_d3d11_async(cppname, method):
assert "005" in cppname
return "ivrrendermodels_load_into_texture_d3d11_async"
method_overrides = [
("IVRClientCore", "Init", ivrclientcore_init),
("IVRClientCore", "GetGenericInterface", ivrclientcore_get_generic_interface),
@ -187,6 +191,7 @@ method_overrides = [
("IVRCompositor", "PostPresentHandoff", ivrcompositor_post_present_handoff),
("IVRCompositor", "WaitGetPoses", ivrcompositor_wait_get_poses),
("IVRCompositor", "GetVulkanDeviceExtensionsRequired", ivrcompositor_get_vulkan_device_extensions_required),
("IVRRenderModels", "LoadIntoTextureD3D11_Async", ivrrendermodels_load_into_texture_d3d11_async),
]
method_overrides_data = [

8
vrclient_x64/vrclient_x64/vrclient_defs.h
View File

@ -19,7 +19,6 @@ typedef int
EVRInitError,
EVRApplicationType,
EVRButtonId,
EVRRenderModelError,
EVRCompositorError,
EVRApplicationError,
EVRApplicationProperty,
@ -286,4 +285,11 @@ typedef enum EVRCompositorTimingMode
VRCompositorTimingMode_Explicit_ApplicationPerformsPostPresentHandoff = 2,
} EVRCompositorTimingMode;
typedef enum EVRRenderModelError
{
VRRenderModelError_None = 0,
VRRenderModelError_Loading = 100,
VRRenderModelError_NotSupported = 200,
} EVRRenderModelError;
#endif

88
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -28,6 +28,11 @@
#include "cppIVRCompositor_IVRCompositor_021.h"
#include "cppIVRCompositor_IVRCompositor_022.h"
typedef struct winRenderModel_t_1015 winRenderModel_t_1015;
typedef struct winRenderModel_TextureMap_t_1015 winRenderModel_TextureMap_t_1015;
#include "cppIVRRenderModels_IVRRenderModels_005.h"
WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
@ -946,6 +951,89 @@ uint32_t ivrcompositor_get_vulkan_device_extensions_required(
return cpp_func(linux_side, phys_dev, value, bufsize);
}
struct winRenderModel_TextureMap_t_1015 {
uint16_t unWidth;
uint16_t unHeight;
const uint8_t *rubTextureMapData;
} __attribute__ ((ms_struct));
static EVRRenderModelError load_into_texture_d3d11(ID3D11Texture2D *texture,
const struct winRenderModel_TextureMap_t_1015 *data)
{
D3D11_TEXTURE2D_DESC texture_desc;
ID3D11DeviceContext *context;
ID3D11Device *device;
texture->lpVtbl->GetDesc(texture, &texture_desc);
TRACE("Format %#x, width %u, height %u.\n",
texture_desc.Format, texture_desc.Width, texture_desc.Height);
TRACE("Array size %u, miplevels %u.\n",
texture_desc.ArraySize, texture_desc.MipLevels);
if (texture_desc.Format != DXGI_FORMAT_R8G8B8A8_UNORM_SRGB)
{
FIXME("Unexpected format %#x.\n", texture_desc.Format);
return VRRenderModelError_NotSupported;
}
if (texture_desc.Width != data->unWidth)
{
FIXME("Unexpected width %u.\n", texture_desc.Width);
return VRRenderModelError_NotSupported;
}
if (texture_desc.Height != data->unHeight)
{
FIXME("Unexpected height %u.\n", texture_desc.Height);
return VRRenderModelError_NotSupported;
}
texture->lpVtbl->GetDevice(texture, &device);
device->lpVtbl->GetImmediateContext(device, &context);
device->lpVtbl->Release(device);
context->lpVtbl->UpdateSubresource(context, (ID3D11Resource *)texture,
0, NULL, data->rubTextureMapData, data->unWidth * 4 * sizeof(uint8_t), 0);
context->lpVtbl->Release(context);
return VRRenderModelError_None;
}
EVRRenderModelError ivrrendermodels_load_into_texture_d3d11_async(
EVRRenderModelError (*cpp_func)(void *, TextureID_t, void *),
void *linux_side, TextureID_t texture_id, void *dst_texture, unsigned int version)
{
struct winRenderModel_TextureMap_t_1015 *texture_map;
IUnknown *unk = dst_texture;
EVRRenderModelError error;
ID3D11Texture2D *texture;
error = cppIVRRenderModels_IVRRenderModels_005_LoadTexture_Async(linux_side, texture_id, &texture_map);
if (error == VRRenderModelError_Loading)
{
TRACE("Loading.\n");
return error;
}
if (error != VRRenderModelError_None)
{
WARN("Failed to load texture %#x.\n", error);
return error;
}
if (SUCCEEDED(unk->lpVtbl->QueryInterface(unk, &IID_ID3D11Texture2D, (void **)&texture)))
{
error = load_into_texture_d3d11(texture, texture_map);
texture->lpVtbl->Release(texture);
}
else
{
FIXME("Expected 2D texture.\n");
error = VRRenderModelError_NotSupported;
}
cppIVRRenderModels_IVRRenderModels_005_FreeTexture(linux_side, texture_map);
return error;
}
void destroy_compositor_data(struct compositor_data *data)
{
IWineD3D11Device *wined3d_device;

5
vrclient_x64/vrclient_x64/vrclient_private.h
View File

@ -132,6 +132,11 @@ uint32_t ivrcompositor_get_vulkan_device_extensions_required(
uint32_t (*cpp_func)(void *, VkPhysicalDevice_T *, char *, uint32_t),
void *linux_side, VkPhysicalDevice_T *phys_dev, char *value, uint32_t bufsize,
unsigned int version, struct compositor_data *user_data);
EVRRenderModelError ivrrendermodels_load_into_texture_d3d11_async(
EVRRenderModelError (*cpp_func)(void *, TextureID_t, void *),
void *linux_side, TextureID_t texture_id, void *dst_texture, unsigned int version);
#endif /* __cplusplus */
#define TRACE WINE_TRACE

2
vrclient_x64/vrclient_x64/winIVRRenderModels.c
View File

@ -64,7 +64,7 @@ DEFINE_THISCALL_WRAPPER(winIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3
EVRRenderModelError __thiscall winIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3D11_Async(winIVRRenderModels_IVRRenderModels_005 *_this, TextureID_t textureId, void * pDstTexture)
{
TRACE("%p\n", _this);
return cppIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3D11_Async(_this->linux_side, textureId, pDstTexture);
return ivrrendermodels_load_into_texture_d3d11_async(cppIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3D11_Async, _this->linux_side, textureId, pDstTexture, 5);
}
DEFINE_THISCALL_WRAPPER(winIVRRenderModels_IVRRenderModels_005_FreeTextureD3D11, 12)