=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9: Remove ctab_constant typedef.
Alexandre Julliard
julliard at winehq.org
Fri Aug 24 13:46:43 CDT 2012
Module: wine
Branch: master
Commit: 6676a729b4c7dd21aa1dbfd038a4e99b3c506aef
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6676a729b4c7dd21aa1dbfd038a4e99b3c506aef
Author: Rico Schüller <kgbricola at web.de>
Date: Thu Aug 23 21:36:27 2012 +0200
d3dx9: Remove ctab_constant typedef.
---
dlls/d3dx9_36/shader.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index e44e618..1cac23c 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -616,10 +616,10 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module,
}
-typedef struct ctab_constant {
+struct ctab_constant {
D3DXCONSTANT_DESC desc;
struct ctab_constant *members;
-} ctab_constant;
+};
static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl;
@@ -629,7 +629,7 @@ struct ID3DXConstantTableImpl {
char *ctab;
DWORD size;
D3DXCONSTANTTABLE_DESC desc;
- ctab_constant *constants;
+ struct ctab_constant *constants;
};
static void free_constant_table(struct ID3DXConstantTableImpl *table)
@@ -662,7 +662,7 @@ static inline int is_constant_handle(D3DXHANDLE handle)
return !((UINT_PTR)handle >> 16);
}
-static inline ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle)
+static inline struct ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle)
{
return &table->constants[(UINT_PTR)handle - 1];
}
@@ -763,7 +763,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable
D3DXCONSTANT_DESC *desc, UINT *count)
{
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
- ctab_constant *constant_info;
+ struct ctab_constant *constant_info;
TRACE("(%p)->(%p, %p, %p)\n", This, constant, desc, count);
@@ -1416,7 +1416,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl =
ID3DXConstantTableImpl_SetMatrixTransposePointerArray
};
-static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_constant *constant)
+static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, struct ctab_constant *constant)
{
constant->desc.Class = type->Class;
constant->desc.Type = type->Type;
More information about the wine-cvs
mailing list