d3dcompiler: Use an iface instead of a vtbl pointer in d3dcompiler_shader_reflection.

This commit is contained in:
Rico Schüller 2010-12-21 11:05:58 +01:00 committed by Alexandre Julliard
parent 806961ec28
commit 8f08d38520
2 changed files with 9 additions and 4 deletions

View File

@ -60,7 +60,7 @@ HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags,
/* ID3D11ShaderReflection */
struct d3dcompiler_shader_reflection
{
const struct ID3D11ShaderReflectionVtbl *vtbl;
ID3D11ShaderReflection ID3D11ShaderReflection_iface;
LONG refcount;
};

View File

@ -25,6 +25,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);
static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflection(ID3D11ShaderReflection *iface)
{
return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface);
}
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object)
@ -47,7 +52,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID
static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11ShaderReflection *iface)
{
struct d3dcompiler_shader_reflection *This = (struct d3dcompiler_shader_reflection *)iface;
struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount);
@ -57,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11Shader
static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11ShaderReflection *iface)
{
struct d3dcompiler_shader_reflection *This = (struct d3dcompiler_shader_reflection *)iface;
struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount);
@ -249,7 +254,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection
HRESULT hr;
unsigned int i;
reflection->vtbl = &d3dcompiler_shader_reflection_vtbl;
reflection->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl;
reflection->refcount = 1;
hr = dxbc_parse(data, data_size, &src_dxbc);