Module: wine Branch: master Commit: 9ea84e251da6d62044c1d9bd05f00e7206b7f0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea84e251da6d62044c1d9bd05...
Author: Józef Kucia jkucia@codeweavers.com Date: Tue Oct 27 03:02:28 2015 +0100
d3d11: Rename d3d10_query to d3d_query.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d11/async.c | 24 ++++++++++++------------ dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 8983321..8f691a2 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -24,16 +24,16 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d11);
-static inline struct d3d10_query *impl_from_ID3D10Query(ID3D10Query *iface) +static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) { - return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); }
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface);
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
@@ -56,7 +56,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface,
static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) { - struct d3d10_query *This = impl_from_ID3D10Query(iface); + struct d3d_query *This = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface)
static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedDecrement(&query->refcount);
TRACE("%p decreasing refcount to %u.\n", query, refcount); @@ -88,7 +88,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface)
static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface);
TRACE("iface %p, device %p.\n", iface, device);
@@ -99,7 +99,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -110,7 +110,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -121,7 +121,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
@@ -181,15 +181,15 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = d3d10_query_GetDesc, };
-struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) +struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &d3d10_query_vtbl); - return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); }
-HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device, +HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) { HRESULT hr; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e8f66e3..104b898 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -351,7 +351,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN;
/* ID3D10Query */ -struct d3d10_query +struct d3d_query { ID3D10Query ID3D10Query_iface; LONG refcount; @@ -362,9 +362,9 @@ struct d3d10_query ID3D10Device1 *device; };
-HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device, +HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; -struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; +struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN;
/* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 380769d..58269d3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2212,7 +2212,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_SetPredication(ID3D10Device1 *iface, ID3D10Predicate *predicate, BOOL value) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *query; + struct d3d_query *query;
TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value);
@@ -2946,7 +2946,7 @@ static void STDMETHODCALLTYPE d3d10_device_GetPredication(ID3D10Device1 *iface, { struct d3d_device *device = impl_from_ID3D10Device(iface); struct wined3d_query *wined3d_predicate; - struct d3d10_query *predicate_impl; + struct d3d_query *predicate_impl;
TRACE("iface %p, predicate %p, value %p.\n", iface, predicate, value);
@@ -3712,7 +3712,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, const D3D10_QUERY_DESC *desc, ID3D10Query **query) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *object; + struct d3d_query *object; HRESULT hr;
TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); @@ -3720,7 +3720,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;
- if (FAILED(hr = d3d10_query_init(object, device, desc, FALSE))) + if (FAILED(hr = d3d_query_init(object, device, desc, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3737,7 +3737,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa const D3D10_QUERY_DESC *desc, ID3D10Predicate **predicate) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *object; + struct d3d_query *object; HRESULT hr;
TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); @@ -3754,7 +3754,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;
- if (FAILED(hr = d3d10_query_init(object, device, desc, TRUE))) + if (FAILED(hr = d3d_query_init(object, device, desc, TRUE))) { WARN("Failed to initialize predicate, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);