rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 16:29:16 +01:00
Code Issues Projects Releases Wiki Activity

[dxgi] Rename IDXGIVkAdapter -> IDXGIDXVKAdapter

Browse Source 
This interface exposes DXVK internals and cannot be used for
Vulkan interop. We shouldn't pretend like it could.
This commit is contained in:
Philip Rebohle 2019-09-18 14:07:01 +02:00
parent bc853d0e48
commit 9e02b6b433
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_main.cpp
View File

@ -27,10 +27,10 @@ extern "C" {
Rc<DxvkAdapter> dxvkAdapter; Rc<DxvkAdapter> dxvkAdapter;
Rc<DxvkInstance> dxvkInstance; Rc<DxvkInstance> dxvkInstance;
Com<IDXGIVkAdapter> dxgiVkAdapter; Com<IDXGIDXVKAdapter> dxgiVkAdapter;
// Try to find the corresponding Vulkan device for the DXGI adapter // Try to find the corresponding Vulkan device for the DXGI adapter
if (SUCCEEDED(pAdapter->QueryInterface(__uuidof(IDXGIVkAdapter), reinterpret_cast<void**>(&dxgiVkAdapter)))) { if (SUCCEEDED(pAdapter->QueryInterface(__uuidof(IDXGIDXVKAdapter), reinterpret_cast<void**>(&dxgiVkAdapter)))) {
dxvkAdapter = dxgiVkAdapter->GetDXVKAdapter(); dxvkAdapter = dxgiVkAdapter->GetDXVKAdapter();
dxvkInstance = dxvkAdapter->instance(); dxvkInstance = dxvkAdapter->instance();
} else { } else {

2
src/dxgi/dxgi_adapter.cpp
View File

@ -38,7 +38,7 @@ namespace dxvk {
|| riid == __uuidof(IDXGIAdapter1) || riid == __uuidof(IDXGIAdapter1)
|| riid == __uuidof(IDXGIAdapter2) || riid == __uuidof(IDXGIAdapter2)
|| riid == __uuidof(IDXGIAdapter3) || riid == __uuidof(IDXGIAdapter3)
|| riid == __uuidof(IDXGIVkAdapter)) { || riid == __uuidof(IDXGIDXVKAdapter)) {
*ppvObject = ref(this); *ppvObject = ref(this);
return S_OK; return S_OK;
} }

2
src/dxgi/dxgi_adapter.h
View File

@ -12,7 +12,7 @@ namespace dxvk {
class DxgiFactory; class DxgiFactory;
class DxgiOutput; class DxgiOutput;
class DxgiAdapter : public DxgiObject<IDXGIVkAdapter> { class DxgiAdapter : public DxgiObject<IDXGIDXVKAdapter> {
public: public:

6
src/dxgi/dxgi_interfaces.h
View File

@ -81,7 +81,7 @@ IDXGIVkSwapChain : public IUnknown {
* this interface. * this interface.
*/ */
MIDL_INTERFACE("907bf281-ea3c-43b4-a8e4-9f231107b4ff") MIDL_INTERFACE("907bf281-ea3c-43b4-a8e4-9f231107b4ff")
IDXGIVkAdapter : public IDXGIAdapter3 { IDXGIDXVKAdapter : public IDXGIAdapter3 {
static const GUID guid; static const GUID guid;
virtual dxvk::Rc<dxvk::DxvkAdapter> STDMETHODCALLTYPE GetDXVKAdapter() = 0; virtual dxvk::Rc<dxvk::DxvkAdapter> STDMETHODCALLTYPE GetDXVKAdapter() = 0;
@ -297,14 +297,14 @@ IWineDXGISwapChainFactory : public IUnknown {
#ifdef _MSC_VER #ifdef _MSC_VER
struct __declspec(uuid("907bf281-ea3c-43b4-a8e4-9f231107b4ff")) IDXGIVkAdapter; struct __declspec(uuid("907bf281-ea3c-43b4-a8e4-9f231107b4ff")) IDXGIDXVKAdapter;
struct __declspec(uuid("c06a236f-5be3-448a-8943-89c611c0c2c1")) IDXGIVkMonitorInfo; struct __declspec(uuid("c06a236f-5be3-448a-8943-89c611c0c2c1")) IDXGIVkMonitorInfo;
struct __declspec(uuid("e2ef5fa5-dc21-4af7-90c4-f67ef6a09323")) IDXGIVkInteropDevice; struct __declspec(uuid("e2ef5fa5-dc21-4af7-90c4-f67ef6a09323")) IDXGIVkInteropDevice;
struct __declspec(uuid("5546cf8c-77e7-4341-b05d-8d4d5000e77d")) IDXGIVkInteropSurface; struct __declspec(uuid("5546cf8c-77e7-4341-b05d-8d4d5000e77d")) IDXGIVkInteropSurface;
struct __declspec(uuid("104001a6-7f36-4957-b932-86ade9567d91")) IDXGIVkSwapChain; struct __declspec(uuid("104001a6-7f36-4957-b932-86ade9567d91")) IDXGIVkSwapChain;
struct __declspec(uuid("53cb4ff0-c25a-4164-a891-0e83db0a7aac")) IWineDXGISwapChainFactory; struct __declspec(uuid("53cb4ff0-c25a-4164-a891-0e83db0a7aac")) IWineDXGISwapChainFactory;
#else #else
DXVK_DEFINE_GUID(IDXGIVkAdapter); DXVK_DEFINE_GUID(IDXGIDXVKAdapter);
DXVK_DEFINE_GUID(IDXGIVkMonitorInfo); DXVK_DEFINE_GUID(IDXGIVkMonitorInfo);
DXVK_DEFINE_GUID(IDXGIVkInteropDevice); DXVK_DEFINE_GUID(IDXGIVkInteropDevice);
DXVK_DEFINE_GUID(IDXGIVkInteropSurface); DXVK_DEFINE_GUID(IDXGIVkInteropSurface);

2
src/util/com/com_guid.cpp
View File

@ -6,7 +6,7 @@
const GUID ID3D11VkExtDevice::guid = {0x8a6e3c42,0xf74c,0x45b7,{0x82,0x65,0xa2,0x31,0xb6,0x77,0xca,0x17}}; const GUID ID3D11VkExtDevice::guid = {0x8a6e3c42,0xf74c,0x45b7,{0x82,0x65,0xa2,0x31,0xb6,0x77,0xca,0x17}};
const GUID ID3D11VkExtContext::guid = {0xfd0bca13,0x5cb6,0x4c3a,{0x98,0x7e,0x47,0x50,0xde,0x2c,0xa7,0x91}}; const GUID ID3D11VkExtContext::guid = {0xfd0bca13,0x5cb6,0x4c3a,{0x98,0x7e,0x47,0x50,0xde,0x2c,0xa7,0x91}};
const GUID IDXGIVkAdapter::guid = {0x907bf281,0xea3c,0x43b4,{0xa8,0xe4,0x9f,0x23,0x11,0x07,0xb4,0xff}}; const GUID IDXGIDXVKAdapter::guid = {0x907bf281,0xea3c,0x43b4,{0xa8,0xe4,0x9f,0x23,0x11,0x07,0xb4,0xff}};
const GUID IDXGIVkMonitorInfo::guid = {0xc06a236f,0x5be3,0x448a,{0x89,0x43,0x89,0xc6,0x11,0xc0,0xc2,0xc1}}; const GUID IDXGIVkMonitorInfo::guid = {0xc06a236f,0x5be3,0x448a,{0x89,0x43,0x89,0xc6,0x11,0xc0,0xc2,0xc1}};
const GUID IDXGIVkInteropDevice::guid = {0xe2ef5fa5,0xdc21,0x4af7,{0x90,0xc4,0xf6,0x7e,0xf6,0xa0,0x93,0x23}}; const GUID IDXGIVkInteropDevice::guid = {0xe2ef5fa5,0xdc21,0x4af7,{0x90,0xc4,0xf6,0x7e,0xf6,0xa0,0x93,0x23}};
const GUID IDXGIVkInteropSurface::guid = {0x5546cf8c,0x77e7,0x4341,{0xb0,0x5d,0x8d,0x4d,0x50,0x00,0xe7,0x7d}}; const GUID IDXGIVkInteropSurface::guid = {0x5546cf8c,0x77e7,0x4341,{0xb0,0x5d,0x8d,0x4d,0x50,0x00,0xe7,0x7d}};