Commit eae33d55 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

dxgi: Rename dxgi_swapchain to d3d11_swapchain.

We will have more than one implementation of IDXGISwapChain. Signed-off-by: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 47dea5ba
...@@ -327,7 +327,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa ...@@ -327,7 +327,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa
if (!(object = heap_alloc_zero(sizeof(*object)))) if (!(object = heap_alloc_zero(sizeof(*object))))
{ {
ERR("Failed to allocate DXGI surface object memory\n"); ERR("Failed to allocate DXGI surface object memory.\n");
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
...@@ -338,7 +338,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa ...@@ -338,7 +338,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa
return hr; return hr;
} }
TRACE("Created IDXGISurface %p\n", object); TRACE("Created IDXGISurface %p.\n", object);
*surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface1_iface; *surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface1_iface;
return S_OK; return S_OK;
...@@ -348,7 +348,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i ...@@ -348,7 +348,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i
struct wined3d_swapchain_desc *desc, BOOL implicit, struct wined3d_swapchain **wined3d_swapchain) struct wined3d_swapchain_desc *desc, BOOL implicit, struct wined3d_swapchain **wined3d_swapchain)
{ {
struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); struct dxgi_device *device = impl_from_IWineDXGIDevice(iface);
struct dxgi_swapchain *object; struct d3d11_swapchain *object;
HRESULT hr; HRESULT hr;
TRACE("iface %p, desc %p, wined3d_swapchain %p.\n", TRACE("iface %p, desc %p, wined3d_swapchain %p.\n",
...@@ -360,7 +360,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i ...@@ -360,7 +360,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
if (FAILED(hr = dxgi_swapchain_init(object, device, desc, implicit))) if (FAILED(hr = d3d11_swapchain_init(object, device, desc, implicit)))
{ {
WARN("Failed to initialize swapchain, hr %#x.\n", hr); WARN("Failed to initialize swapchain, hr %#x.\n", hr);
heap_free(object); heap_free(object);
......
...@@ -160,7 +160,7 @@ HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal, ...@@ -160,7 +160,7 @@ HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal,
struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) DECLSPEC_HIDDEN; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) DECLSPEC_HIDDEN;
/* IDXGISwapChain */ /* IDXGISwapChain */
struct dxgi_swapchain struct d3d11_swapchain
{ {
IDXGISwapChain1 IDXGISwapChain1_iface; IDXGISwapChain1 IDXGISwapChain1_iface;
LONG refcount; LONG refcount;
...@@ -173,7 +173,7 @@ struct dxgi_swapchain ...@@ -173,7 +173,7 @@ struct dxgi_swapchain
IDXGIOutput *target; IDXGIOutput *target;
}; };
HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device *device, HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device,
struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN;
/* IDXGISurface */ /* IDXGISurface */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment