niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

[d3d11] Pass device directly to D3D11DXGIKeyedMutex

Browse source
This commit is contained in:
Paul Gofman 2023-09-13 14:42:48 -06:00 • committed by Joshie
parent c113b791a1
commit f93cfbc26a
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d3d11/d3d11_buffer.cpp
View file

@ -12,7 +12,7 @@ namespace dxvk {
const D3D11_ON_12_RESOURCE_INFO* p11on12Info) const D3D11_ON_12_RESOURCE_INFO* p11on12Info)
: D3D11DeviceChild<ID3D11Buffer>(pDevice), : D3D11DeviceChild<ID3D11Buffer>(pDevice),
m_desc (*pDesc), m_desc (*pDesc),
m_resource (this), m_resource (this, pDevice),
m_d3d10 (this) { m_d3d10 (this) {
DxvkBufferCreateInfo info; DxvkBufferCreateInfo info;
info.flags = 0; info.flags = 0;

14
src/d3d11/d3d11_resource.cpp
View file

@ -9,11 +9,10 @@
namespace dxvk { namespace dxvk {
D3D11DXGIKeyedMutex::D3D11DXGIKeyedMutex( D3D11DXGIKeyedMutex::D3D11DXGIKeyedMutex(
ID3D11Resource* pResource) ID3D11Resource* pResource,
: m_resource(pResource) { D3D11Device* pDevice)
Com<ID3D11Device> device; : m_resource(pResource),
m_resource->GetDevice(&device); m_device(pDevice) {
m_device = static_cast<D3D11Device*>(device.ptr());
m_supported = m_device->GetDXVKDevice()->features().khrWin32KeyedMutex m_supported = m_device->GetDXVKDevice()->features().khrWin32KeyedMutex
&& m_device->GetDXVKDevice()->vkd()->wine_vkAcquireKeyedMutex != nullptr && m_device->GetDXVKDevice()->vkd()->wine_vkAcquireKeyedMutex != nullptr
@ -120,9 +119,10 @@ namespace dxvk {
} }
D3D11DXGIResource::D3D11DXGIResource( D3D11DXGIResource::D3D11DXGIResource(
ID3D11Resource* pResource) ID3D11Resource* pResource,
D3D11Device* pDevice)
: m_resource(pResource), : m_resource(pResource),
m_keyedMutex(pResource) { m_keyedMutex(pResource, pDevice) {
} }

6
src/d3d11/d3d11_resource.h
View file

@ -30,7 +30,8 @@ namespace dxvk {
public: public:
D3D11DXGIKeyedMutex( D3D11DXGIKeyedMutex(
ID3D11Resource* pResource); ID3D11Resource* pResource,
D3D11Device* pDevice);
~D3D11DXGIKeyedMutex(); ~D3D11DXGIKeyedMutex();
@ -88,7 +89,8 @@ namespace dxvk {
public: public:
D3D11DXGIResource( D3D11DXGIResource(
ID3D11Resource* pResource); ID3D11Resource* pResource,
D3D11Device* pDevice);
~D3D11DXGIResource(); ~D3D11DXGIResource();

10
src/d3d11/d3d11_texture.cpp
View file

@ -1099,7 +1099,7 @@ namespace dxvk {
m_texture (this, pDevice, pDesc, p11on12Info, D3D11_RESOURCE_DIMENSION_TEXTURE1D, 0, VK_NULL_HANDLE, nullptr), m_texture (this, pDevice, pDesc, p11on12Info, D3D11_RESOURCE_DIMENSION_TEXTURE1D, 0, VK_NULL_HANDLE, nullptr),
m_interop (this, &m_texture), m_interop (this, &m_texture),
m_surface (this, &m_texture), m_surface (this, &m_texture),
m_resource(this), m_resource(this, pDevice),
m_d3d10 (this) { m_d3d10 (this) {
} }
@ -1205,7 +1205,7 @@ namespace dxvk {
m_texture (this, pDevice, pDesc, p11on12Info, D3D11_RESOURCE_DIMENSION_TEXTURE2D, 0, VK_NULL_HANDLE, hSharedHandle), m_texture (this, pDevice, pDesc, p11on12Info, D3D11_RESOURCE_DIMENSION_TEXTURE2D, 0, VK_NULL_HANDLE, hSharedHandle),
m_interop (this, &m_texture), m_interop (this, &m_texture),
m_surface (this, &m_texture), m_surface (this, &m_texture),
m_resource (this), m_resource (this, pDevice),
m_d3d10 (this), m_d3d10 (this),
m_swapChain (nullptr) { m_swapChain (nullptr) {
} }
@ -1220,7 +1220,7 @@ namespace dxvk {
m_texture (this, pDevice, pDesc, nullptr, D3D11_RESOURCE_DIMENSION_TEXTURE2D, DxgiUsage, vkImage, nullptr), m_texture (this, pDevice, pDesc, nullptr, D3D11_RESOURCE_DIMENSION_TEXTURE2D, DxgiUsage, vkImage, nullptr),
m_interop (this, &m_texture), m_interop (this, &m_texture),
m_surface (this, &m_texture), m_surface (this, &m_texture),
m_resource (this), m_resource (this, pDevice),
m_d3d10 (this), m_d3d10 (this),
m_swapChain (nullptr) { m_swapChain (nullptr) {
@ -1236,7 +1236,7 @@ namespace dxvk {
m_texture (this, pDevice, pDesc, nullptr, D3D11_RESOURCE_DIMENSION_TEXTURE2D, DxgiUsage, VK_NULL_HANDLE, nullptr), m_texture (this, pDevice, pDesc, nullptr, D3D11_RESOURCE_DIMENSION_TEXTURE2D, DxgiUsage, VK_NULL_HANDLE, nullptr),
m_interop (this, &m_texture), m_interop (this, &m_texture),
m_surface (this, &m_texture), m_surface (this, &m_texture),
m_resource (this), m_resource (this, pDevice),
m_d3d10 (this), m_d3d10 (this),
m_swapChain (pSwapChain) { m_swapChain (pSwapChain) {
@ -1384,7 +1384,7 @@ namespace dxvk {
: D3D11DeviceChild<ID3D11Texture3D1>(pDevice), : D3D11DeviceChild<ID3D11Texture3D1>(pDevice),
m_texture (this, pDevice, pDesc, p11on12Info, D3D11_RESOURCE_DIMENSION_TEXTURE3D, 0, VK_NULL_HANDLE, nullptr), m_texture (this, pDevice, pDesc, p11on12Info, D3D11_RESOURCE_DIMENSION_TEXTURE3D, 0, VK_NULL_HANDLE, nullptr),
m_interop (this, &m_texture), m_interop (this, &m_texture),
m_resource(this), m_resource(this, pDevice),
m_d3d10 (this) { m_d3d10 (this) {
} }