Christian Costa : d3dx9_36: Add missing GetSamplerIndex method to ID3DXConstantTable.
Alexandre Julliard
julliard at winehq.org
Fri Mar 19 11:16:39 CDT 2010
Module: wine
Branch: master
Commit: 441ee394958d6560292bc2ec84445c2ed5dd0308
URL: http://source.winehq.org/git/wine.git/?a=commit;h=441ee394958d6560292bc2ec84445c2ed5dd0308
Author: Christian Costa <titan.costa at wanadoo.fr>
Date: Fri Mar 19 11:54:11 2010 +0100
d3dx9_36: Add missing GetSamplerIndex method to ID3DXConstantTable.
---
dlls/d3dx9_36/shader.c | 10 ++++++++++
include/d3dx9shader.h | 3 +++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 10dc631..a87911e 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -374,6 +374,15 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable*
return E_NOTIMPL;
}
+static UINT WINAPI ID3DXConstantTableImpl_GetSamplerIndex(LPD3DXCONSTANTTABLE iface, D3DXHANDLE constant)
+{
+ ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
+
+ FIXME("(%p)->(%p): stub\n", This, constant);
+
+ return (UINT)-1;
+}
+
static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index)
{
ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface;
@@ -571,6 +580,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl =
/*** ID3DXConstantTable methods ***/
ID3DXConstantTableImpl_GetDesc,
ID3DXConstantTableImpl_GetConstantDesc,
+ ID3DXConstantTableImpl_GetSamplerIndex,
ID3DXConstantTableImpl_GetConstant,
ID3DXConstantTableImpl_GetConstantByName,
ID3DXConstantTableImpl_GetConstantByElement,
diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h
index 2fee386..30a57b0 100644
--- a/include/d3dx9shader.h
+++ b/include/d3dx9shader.h
@@ -129,6 +129,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
/*** ID3DXConstantTable methods ***/
STDMETHOD(GetDesc)(THIS_ D3DXCONSTANTTABLE_DESC *pDesc) PURE;
STDMETHOD(GetConstantDesc)(THIS_ D3DXHANDLE hConstant, D3DXCONSTANT_DESC *pConstantDesc, UINT *pCount) PURE;
+ STDMETHOD_(UINT, GetSamplerIndex)(THIS_ D3DXHANDLE hConstant) PURE;
STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
@@ -161,6 +162,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
/*** ID3DXConstantTable methods ***/
#define ID3DXConstantTable_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a)
#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->lpVtbl->GetConstantDesc(p,a,b,c)
+#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->lpVtbl->GetSamplerIndex(p,a)
#define ID3DXConstantTable_GetConstant(p,a,b) (p)->lpVtbl->GetConstant(p,a,b)
#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->lpVtbl->GetConstantByName(p,a,b)
#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->lpVtbl->GetConstantElement(p,a,b)
@@ -191,6 +193,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
/*** ID3DXConstantTable methods ***/
#define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a)
#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c)
+#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->GetConstantDesc(a)
#define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b)
#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b)
#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b)
More information about the wine-cvs
mailing list