wined3d: Remove IWineD3DVertexDeclaration_SetDeclaration() from the public interface.
This commit is contained in:
parent
d8a4cc6648
commit
4330d20d0d
|
@ -2172,7 +2172,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice*
|
||||||
|
|
||||||
*ppVertexDeclaration = (IWineD3DVertexDeclaration *)object;
|
*ppVertexDeclaration = (IWineD3DVertexDeclaration *)object;
|
||||||
|
|
||||||
hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count);
|
hr = vertexdeclaration_init(object, elements, element_count);
|
||||||
|
|
||||||
if(FAILED(hr)) {
|
if(FAILED(hr)) {
|
||||||
IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)object);
|
IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)object);
|
||||||
*ppVertexDeclaration = NULL;
|
*ppVertexDeclaration = NULL;
|
||||||
|
|
|
@ -191,9 +191,9 @@ static BOOL declaration_element_valid_ffp(const WINED3DVERTEXELEMENT *element)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVertexDeclaration *iface,
|
HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This,
|
||||||
const WINED3DVERTEXELEMENT *elements, UINT element_count) {
|
const WINED3DVERTEXELEMENT *elements, UINT element_count)
|
||||||
IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
|
{
|
||||||
HRESULT hr = WINED3D_OK;
|
HRESULT hr = WINED3D_OK;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
char isPreLoaded[MAX_STREAMS];
|
char isPreLoaded[MAX_STREAMS];
|
||||||
|
@ -271,5 +271,4 @@ const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl =
|
||||||
/* IWineD3DVertexDeclaration */
|
/* IWineD3DVertexDeclaration */
|
||||||
IWineD3DVertexDeclarationImpl_GetParent,
|
IWineD3DVertexDeclarationImpl_GetParent,
|
||||||
IWineD3DVertexDeclarationImpl_GetDevice,
|
IWineD3DVertexDeclarationImpl_GetDevice,
|
||||||
IWineD3DVertexDeclarationImpl_SetDeclaration
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1765,6 +1765,9 @@ typedef struct IWineD3DVertexDeclarationImpl {
|
||||||
|
|
||||||
extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;
|
extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;
|
||||||
|
|
||||||
|
HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This,
|
||||||
|
const WINED3DVERTEXELEMENT *elements, UINT element_count);
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IWineD3DStateBlock implementation structure
|
* IWineD3DStateBlock implementation structure
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -2758,10 +2758,6 @@ interface IWineD3DVertexDeclaration : IWineD3DBase
|
||||||
HRESULT GetDevice(
|
HRESULT GetDevice(
|
||||||
[out] IWineD3DDevice **device
|
[out] IWineD3DDevice **device
|
||||||
);
|
);
|
||||||
HRESULT SetDeclaration(
|
|
||||||
[in] const WINED3DVERTEXELEMENT *elements,
|
|
||||||
[in] UINT element_count
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in New Issue