=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Rename d3d10_geometry_shader to d3d_geometry_shader.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 5 10:30:25 CDT 2015
Module: wine
Branch: master
Commit: 6c8c61f41195e8390b49b4e42d5c41a97494a8e7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8c61f41195e8390b49b4e42d5c41a97494a8e7
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Oct 2 01:31:46 2015 +0200
d3d11: Rename d3d10_geometry_shader to d3d_geometry_shader.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d11/d3d11_private.h | 6 +++---
dlls/d3d11/device.c | 8 ++++----
dlls/d3d11/shader.c | 28 ++++++++++++++--------------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 6d9489a..7819cac 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -241,7 +241,7 @@ HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_cod
struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN;
/* ID3D10GeometryShader */
-struct d3d10_geometry_shader
+struct d3d_geometry_shader
{
ID3D10GeometryShader ID3D10GeometryShader_iface;
LONG refcount;
@@ -250,9 +250,9 @@ struct d3d10_geometry_shader
struct wined3d_shader *wined3d_shader;
};
-HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d_device *device,
+HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN;
-struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN;
+struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN;
/* ID3D11PixelShader, ID3D10PixelShader */
struct d3d_pixel_shader
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index f56d3a9..8168fee 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -896,7 +896,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device1 *i
static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device1 *iface, ID3D10GeometryShader *shader)
{
struct d3d_device *device = impl_from_ID3D10Device(iface);
- struct d3d10_geometry_shader *gs = unsafe_impl_from_ID3D10GeometryShader(shader);
+ struct d3d_geometry_shader *gs = unsafe_impl_from_ID3D10GeometryShader(shader);
TRACE("iface %p, shader %p.\n", iface, shader);
@@ -1598,7 +1598,7 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device1 *i
static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device1 *iface, ID3D10GeometryShader **shader)
{
struct d3d_device *device = impl_from_ID3D10Device(iface);
- struct d3d10_geometry_shader *shader_impl;
+ struct d3d_geometry_shader *shader_impl;
struct wined3d_shader *wined3d_shader;
TRACE("iface %p, shader %p.\n", iface, shader);
@@ -2310,7 +2310,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device1
const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader)
{
struct d3d_device *This = impl_from_ID3D10Device(iface);
- struct d3d10_geometry_shader *object;
+ struct d3d_geometry_shader *object;
HRESULT hr;
TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p.\n",
@@ -2320,7 +2320,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device1
if (!object)
return E_OUTOFMEMORY;
- hr = d3d10_geometry_shader_init(object, This, byte_code, byte_code_length);
+ hr = d3d_geometry_shader_init(object, This, byte_code, byte_code_length);
if (FAILED(hr))
{
WARN("Failed to initialize geometry shader, hr %#x.\n", hr);
diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c
index 40dac3d..25590d0 100644
--- a/dlls/d3d11/shader.c
+++ b/dlls/d3d11/shader.c
@@ -439,9 +439,9 @@ struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader
return impl_from_ID3D10VertexShader(iface);
}
-static inline struct d3d10_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface)
+static inline struct d3d_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface)
{
- return CONTAINING_RECORD(iface, struct d3d10_geometry_shader, ID3D10GeometryShader_iface);
+ return CONTAINING_RECORD(iface, struct d3d_geometry_shader, ID3D10GeometryShader_iface);
}
/* IUnknown methods */
@@ -468,7 +468,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10Geom
static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader *iface)
{
- struct d3d10_geometry_shader *This = impl_from_ID3D10GeometryShader(iface);
+ struct d3d_geometry_shader *This = impl_from_ID3D10GeometryShader(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount);
@@ -478,7 +478,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_AddRef(ID3D10GeometryShader
static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShader *iface)
{
- struct d3d10_geometry_shader *This = impl_from_ID3D10GeometryShader(iface);
+ struct d3d_geometry_shader *This = impl_from_ID3D10GeometryShader(iface);
ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount);
@@ -503,7 +503,7 @@ static void STDMETHODCALLTYPE d3d10_geometry_shader_GetDevice(ID3D10GeometryShad
static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *iface,
REFGUID guid, UINT *data_size, void *data)
{
- struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface);
+ struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n",
iface, debugstr_guid(guid), data_size, data);
@@ -514,7 +514,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10Geom
static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface,
REFGUID guid, UINT data_size, const void *data)
{
- struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface);
+ struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n",
iface, debugstr_guid(guid), data_size, data);
@@ -525,7 +525,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10Geom
static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface,
REFGUID guid, const IUnknown *data)
{
- struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface);
+ struct d3d_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
@@ -545,20 +545,20 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl =
d3d10_geometry_shader_SetPrivateDataInterface,
};
-static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent)
+static void STDMETHODCALLTYPE d3d_geometry_shader_wined3d_object_destroyed(void *parent)
{
- struct d3d10_geometry_shader *shader = parent;
+ struct d3d_geometry_shader *shader = parent;
wined3d_private_store_cleanup(&shader->private_store);
HeapFree(GetProcessHeap(), 0, parent);
}
-static const struct wined3d_parent_ops d3d10_geometry_shader_wined3d_parent_ops =
+static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops =
{
- d3d10_geometry_shader_wined3d_object_destroyed,
+ d3d_geometry_shader_wined3d_object_destroyed,
};
-HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d_device *device,
+HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, struct d3d_device *device,
const void *byte_code, SIZE_T byte_code_length)
{
struct wined3d_shader_signature output_signature;
@@ -588,7 +588,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct
desc.max_version = 4;
hr = wined3d_shader_create_gs(device->wined3d_device, &desc, shader,
- &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader);
+ &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader);
shader_free_signature(&input_signature);
shader_free_signature(&output_signature);
if (FAILED(hr))
@@ -603,7 +603,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct
return S_OK;
}
-struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface)
+struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface)
{
if (!iface)
return NULL;
More information about the wine-cvs
mailing list