Skip to content

W
wine-winehq
Commit 55d30331 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard
Browse files
Options

d3d11: Rename d3d10_shader_resource_view to d3d_shader_resource_view.

parent 825b141e
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
dlls/d3d11/d3d11_private.h
View file @ 55d30331
...@@ -189,7 +189,7 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource * ...@@ -189,7 +189,7 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *
struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN;
/* ID3D10ShaderResourceView */ /* ID3D10ShaderResourceView */
struct d3d10_shader_resource_view struct d3d_shader_resource_view
{ {
ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; ID3D10ShaderResourceView ID3D10ShaderResourceView_iface;
LONG refcount; LONG refcount;
...@@ -201,9 +201,9 @@ struct d3d10_shader_resource_view ...@@ -201,9 +201,9 @@ struct d3d10_shader_resource_view
ID3D10Device1 *device; ID3D10Device1 *device;
}; };
HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d_device *device, HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN;
struct d3d10_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(
ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN;
/* ID3D10InputLayout */ /* ID3D10InputLayout */
......
dlls/d3d11/device.c
View file @ 55d30331
...@@ -613,7 +613,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device1 *i ...@@ -613,7 +613,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device1 *i
wined3d_mutex_lock(); wined3d_mutex_lock();
for (i = 0; i < view_count; ++i) for (i = 0; i < view_count; ++i)
{ {
struct d3d10_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]); struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]);
wined3d_device_set_ps_resource_view(device->wined3d_device, start_slot + i, wined3d_device_set_ps_resource_view(device->wined3d_device, start_slot + i,
view ? view->wined3d_view : NULL); view ? view->wined3d_view : NULL);
...@@ -855,7 +855,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetShaderResources(ID3D10Device1 *i ...@@ -855,7 +855,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetShaderResources(ID3D10Device1 *i
wined3d_mutex_lock(); wined3d_mutex_lock();
for (i = 0; i < view_count; ++i) for (i = 0; i < view_count; ++i)
{ {
struct d3d10_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]); struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]);
wined3d_device_set_vs_resource_view(device->wined3d_device, start_slot + i, wined3d_device_set_vs_resource_view(device->wined3d_device, start_slot + i,
view ? view->wined3d_view : NULL); view ? view->wined3d_view : NULL);
...@@ -908,7 +908,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device1 *i ...@@ -908,7 +908,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device1 *i
wined3d_mutex_lock(); wined3d_mutex_lock();
for (i = 0; i < view_count; ++i) for (i = 0; i < view_count; ++i)
{ {
struct d3d10_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]); struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D10ShaderResourceView(views[i]);
wined3d_device_set_gs_resource_view(device->wined3d_device, start_slot + i, wined3d_device_set_gs_resource_view(device->wined3d_device, start_slot + i,
view ? view->wined3d_view : NULL); view ? view->wined3d_view : NULL);
...@@ -1297,7 +1297,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device1 *i ...@@ -1297,7 +1297,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device1 *i
for (i = 0; i < view_count; ++i) for (i = 0; i < view_count; ++i)
{ {
struct wined3d_shader_resource_view *wined3d_view; struct wined3d_shader_resource_view *wined3d_view;
struct d3d10_shader_resource_view *view_impl; struct d3d_shader_resource_view *view_impl;
if (!(wined3d_view = wined3d_device_get_ps_resource_view(device->wined3d_device, start_slot + i))) if (!(wined3d_view = wined3d_device_get_ps_resource_view(device->wined3d_device, start_slot + i)))
{ {
...@@ -1568,7 +1568,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetShaderResources(ID3D10Device1 *i ...@@ -1568,7 +1568,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetShaderResources(ID3D10Device1 *i
for (i = 0; i < view_count; ++i) for (i = 0; i < view_count; ++i)
{ {
struct wined3d_shader_resource_view *wined3d_view; struct wined3d_shader_resource_view *wined3d_view;
struct d3d10_shader_resource_view *view_impl; struct d3d_shader_resource_view *view_impl;
if (!(wined3d_view = wined3d_device_get_vs_resource_view(device->wined3d_device, start_slot + i))) if (!(wined3d_view = wined3d_device_get_vs_resource_view(device->wined3d_device, start_slot + i)))
{ {
...@@ -1647,7 +1647,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device1 *i ...@@ -1647,7 +1647,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device1 *i
for (i = 0; i < view_count; ++i) for (i = 0; i < view_count; ++i)
{ {
struct wined3d_shader_resource_view *wined3d_view; struct wined3d_shader_resource_view *wined3d_view;
struct d3d10_shader_resource_view *view_impl; struct d3d_shader_resource_view *view_impl;
if (!(wined3d_view = wined3d_device_get_gs_resource_view(device->wined3d_device, start_slot + i))) if (!(wined3d_view = wined3d_device_get_gs_resource_view(device->wined3d_device, start_slot + i)))
{ {
...@@ -2107,7 +2107,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev ...@@ -2107,7 +2107,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev
ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view)
{ {
struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_device *device = impl_from_ID3D10Device(iface);
struct d3d10_shader_resource_view *object; struct d3d_shader_resource_view *object;
HRESULT hr; HRESULT hr;
TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
...@@ -2115,7 +2115,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev ...@@ -2115,7 +2115,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
if (FAILED(hr = d3d10_shader_resource_view_init(object, device, resource, desc))) if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc)))
{ {
WARN("Failed to initialize shader resource view, hr %#x.\n", hr); WARN("Failed to initialize shader resource view, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, object);
......
dlls/d3d11/view.c
View file @ 55d30331
...@@ -1178,9 +1178,9 @@ struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10Rend ...@@ -1178,9 +1178,9 @@ struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10Rend
return impl_from_ID3D10RenderTargetView(iface); return impl_from_ID3D10RenderTargetView(iface);
} }
static inline struct d3d10_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) static inline struct d3d_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface)
{ {
return CONTAINING_RECORD(iface, struct d3d10_shader_resource_view, ID3D10ShaderResourceView_iface); return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface);
} }
/* IUnknown methods */ /* IUnknown methods */
...@@ -1208,7 +1208,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D1 ...@@ -1208,7 +1208,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D1
static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface) static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface)
{ {
struct d3d10_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface);
ULONG refcount = InterlockedIncrement(&This->refcount); ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u.\n", This, refcount); TRACE("%p increasing refcount to %u.\n", This, refcount);
...@@ -1218,7 +1218,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderRes ...@@ -1218,7 +1218,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderRes
static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface) static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface)
{ {
struct d3d10_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface);
ULONG refcount = InterlockedDecrement(&This->refcount); ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u.\n", This, refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount);
...@@ -1242,7 +1242,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe ...@@ -1242,7 +1242,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe
static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderResourceView *iface, static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderResourceView *iface,
ID3D10Device **device) ID3D10Device **device)
{ {
struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
TRACE("iface %p, device %p.\n", iface, device); TRACE("iface %p, device %p.\n", iface, device);
...@@ -1253,7 +1253,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR ...@@ -1253,7 +1253,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR
static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface, static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface,
REFGUID guid, UINT *data_size, void *data) REFGUID guid, UINT *data_size, void *data)
{ {
struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", TRACE("iface %p, guid %s, data_size %p, data %p.\n",
iface, debugstr_guid(guid), data_size, data); iface, debugstr_guid(guid), data_size, data);
...@@ -1264,7 +1264,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D1 ...@@ -1264,7 +1264,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D1
static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface, static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface,
REFGUID guid, UINT data_size, const void *data) REFGUID guid, UINT data_size, const void *data)
{ {
struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", TRACE("iface %p, guid %s, data_size %u, data %p.\n",
iface, debugstr_guid(guid), data_size, data); iface, debugstr_guid(guid), data_size, data);
...@@ -1275,7 +1275,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D1 ...@@ -1275,7 +1275,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D1
static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface,
REFGUID guid, const IUnknown *data) REFGUID guid, const IUnknown *data)
{ {
struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
...@@ -1287,7 +1287,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterf ...@@ -1287,7 +1287,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterf
static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10ShaderResourceView *iface, static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10ShaderResourceView *iface,
ID3D10Resource **resource) ID3D10Resource **resource)
{ {
struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
TRACE("iface %p, resource %p.\n", iface, resource); TRACE("iface %p, resource %p.\n", iface, resource);
...@@ -1300,7 +1300,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10Shade ...@@ -1300,7 +1300,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10Shade
static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDesc(ID3D10ShaderResourceView *iface, static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDesc(ID3D10ShaderResourceView *iface,
D3D10_SHADER_RESOURCE_VIEW_DESC *desc) D3D10_SHADER_RESOURCE_VIEW_DESC *desc)
{ {
struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
TRACE("iface %p, desc %p.\n", iface, desc); TRACE("iface %p, desc %p.\n", iface, desc);
...@@ -1324,7 +1324,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl ...@@ -1324,7 +1324,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl
d3d10_shader_resource_view_GetDesc, d3d10_shader_resource_view_GetDesc,
}; };
HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d_device *device, HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device,
ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc)
{ {
struct wined3d_resource *wined3d_resource; struct wined3d_resource *wined3d_resource;
...@@ -1367,10 +1367,10 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, ...@@ -1367,10 +1367,10 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view,
return S_OK; return S_OK;
} }
struct d3d10_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface)
{ {
if (!iface) if (!iface)
return NULL; return NULL;
assert(iface->lpVtbl == &d3d10_shader_resource_view_vtbl); assert(iface->lpVtbl == &d3d10_shader_resource_view_vtbl);
return CONTAINING_RECORD(iface, struct d3d10_shader_resource_view, ID3D10ShaderResourceView_iface); return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface);
} }
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