Module: wine Branch: master Commit: 44fa6faa9bf1809ef2cf59f4cfc32a3a93f4ec2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fa6faa9bf1809ef2cf59f4cf...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Sep 9 01:35:41 2015 +0200
d3d11: Rename d3d10_rendertarget_view to d3d_rendertarget_view.
---
dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 10 +++++----- dlls/d3d11/view.c | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c5593d7..ea6e834 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -171,7 +171,7 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource * struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN;
/* ID3D10RenderTargetView */ -struct d3d10_rendertarget_view +struct d3d_rendertarget_view { ID3D10RenderTargetView ID3D10RenderTargetView_iface; LONG refcount; @@ -183,9 +183,9 @@ struct d3d10_rendertarget_view ID3D10Device1 *device; };
-HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d_device *device, +HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; -struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; +struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN;
/* ID3D10ShaderResourceView */ struct d3d10_shader_resource_view diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d6065b4..d9beffe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -940,7 +940,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device1 *ifa wined3d_mutex_lock(); for (i = 0; i < render_target_view_count; ++i) { - struct d3d10_rendertarget_view *rtv = unsafe_impl_from_ID3D10RenderTargetView(render_target_views[i]); + struct d3d_rendertarget_view *rtv = unsafe_impl_from_ID3D10RenderTargetView(render_target_views[i]);
wined3d_device_set_rendertarget_view(device->wined3d_device, i, rtv ? rtv->wined3d_view : NULL, FALSE); @@ -1210,7 +1210,7 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 * ID3D10RenderTargetView *render_target_view, const FLOAT color_rgba[4]) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(render_target_view); + struct d3d_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(render_target_view); const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; HRESULT hr;
@@ -1692,7 +1692,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa wined3d_mutex_lock(); if (render_target_views) { - struct d3d10_rendertarget_view *view_impl; + struct d3d_rendertarget_view *view_impl; unsigned int i;
for (i = 0; i < view_count; ++i) @@ -2122,7 +2122,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_rendertarget_view *object; + struct d3d_rendertarget_view *object; HRESULT hr;
TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); @@ -2130,7 +2130,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;
- if (FAILED(hr = d3d10_rendertarget_view_init(object, device, resource, desc))) + if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc))) { WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index cff0948..4fc77f5 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -766,9 +766,9 @@ struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10Dept return impl_from_ID3D10DepthStencilView(iface); }
-static inline struct d3d10_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +static inline struct d3d_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { - return CONTAINING_RECORD(iface, struct d3d10_rendertarget_view, ID3D10RenderTargetView_iface); + return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D10RenderTargetView_iface); }
/* IUnknown methods */ @@ -796,7 +796,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10Re
static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface) { - struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount); @@ -806,7 +806,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTarget
static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface) { - struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -829,7 +829,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge
static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTargetView *iface, ID3D10Device **device) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
TRACE("iface %p, device %p.\n", iface, device);
@@ -840,7 +840,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -851,7 +851,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -862,7 +862,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
@@ -874,7 +874,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTargetView *iface, ID3D10Resource **resource) { - struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
TRACE("iface %p, resource %p\n", iface, resource);
@@ -887,7 +887,7 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTa static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView *iface, D3D10_RENDER_TARGET_VIEW_DESC *desc) { - struct d3d10_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface); + struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface);
TRACE("iface %p, desc %p\n", iface, desc);
@@ -974,7 +974,7 @@ static void wined3d_rendertarget_view_desc_from_d3d10core(struct wined3d_rendert } }
-HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d_device *device, +HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3d_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) { struct wined3d_rendertarget_view_desc wined3d_desc; @@ -1021,7 +1021,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return S_OK; }
-struct d3d10_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) +struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) { if (!iface) return NULL;