Module: wine Branch: master Commit: f210c42de79e98288a277b6ee48cde351f047a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f210c42de79e98288a277b6ee4...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Sep 16 01:30:12 2015 +0200
d3d11: Rename d3d10_pixel_shader to d3d_pixel_shader.
---
dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 8 ++++---- dlls/d3d11/shader.c | 30 +++++++++++++++--------------- 3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e14a305..5dc50ad 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -255,7 +255,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN;
/* ID3D10PixelShader */ -struct d3d10_pixel_shader +struct d3d_pixel_shader { ID3D10PixelShader ID3D10PixelShader_iface; LONG refcount; @@ -265,9 +265,9 @@ struct d3d10_pixel_shader ID3D10Device1 *device; };
-HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_device *device, +HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; -struct d3d10_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; +struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN;
HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f3e5e89..9ebb5a2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -657,7 +657,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device1 *iface, ID3D10PixelShader *shader) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_pixel_shader *ps = unsafe_impl_from_ID3D10PixelShader(shader); + struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D10PixelShader(shader);
TRACE("iface %p, shader %p\n", iface, shader);
@@ -1347,7 +1347,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device1 *iface, ID3D10PixelShader **shader) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_pixel_shader *shader_impl; + struct d3d_pixel_shader *shader_impl; struct wined3d_shader *wined3d_shader;
TRACE("iface %p, shader %p.\n", iface, shader); @@ -2308,7 +2308,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *i const void *byte_code, SIZE_T byte_code_length, ID3D10PixelShader **shader) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_pixel_shader *object; + struct d3d_pixel_shader *object; HRESULT hr;
TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", @@ -2318,7 +2318,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *i if (!object) return E_OUTOFMEMORY;
- hr = d3d10_pixel_shader_init(object, This, byte_code, byte_code_length); + hr = d3d_pixel_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) { WARN("Failed to initialize pixel shader, hr %#x.\n", hr); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 2df882c..8bf32f0 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -612,9 +612,9 @@ struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10Geomet return impl_from_ID3D10GeometryShader(iface); }
-static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +static inline struct d3d_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { - return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, ID3D10PixelShader_iface); + return CONTAINING_RECORD(iface, struct d3d_pixel_shader, ID3D10PixelShader_iface); }
/* IUnknown methods */ @@ -641,7 +641,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelSh
static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount); @@ -659,7 +659,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *ifac
static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -683,7 +683,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *ifa
static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *iface, ID3D10Device **device) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface);
TRACE("iface %p, device %p.\n", iface, device);
@@ -694,7 +694,7 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -705,7 +705,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -716,7 +716,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + struct d3d_pixel_shader *shader = impl_from_ID3D10PixelShader(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
@@ -736,20 +736,20 @@ static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = d3d10_pixel_shader_SetPrivateDataInterface, };
-static void STDMETHODCALLTYPE d3d10_pixel_shader_wined3d_object_destroyed(void *parent) +static void STDMETHODCALLTYPE d3d_pixel_shader_wined3d_object_destroyed(void *parent) { - struct d3d10_pixel_shader *shader = parent; + struct d3d_pixel_shader *shader = parent;
wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); }
-static const struct wined3d_parent_ops d3d10_pixel_shader_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_pixel_shader_wined3d_parent_ops = { - d3d10_pixel_shader_wined3d_object_destroyed, + d3d_pixel_shader_wined3d_object_destroyed, };
-HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_device *device, +HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { struct wined3d_shader_signature output_signature; @@ -779,7 +779,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_de desc.max_version = 4;
hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, - &d3d10_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader); + &d3d_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader); shader_free_signature(&input_signature); shader_free_signature(&output_signature); if (FAILED(hr)) @@ -797,7 +797,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d_de return S_OK; }
-struct d3d10_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { if (!iface) return NULL;
-
Alexandre Julliard