ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Move some common shader functions to the IWineD3DBaseShader interface.

Browse Source
This commit is contained in:
Henri Verbeet 2009-09-25 13:31:42 +02:00 committed by Alexandre Julliard
parent 27723affc9
commit d76c7a8521
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/pixelshader.c
View File

@ -354,9 +354,9 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl =
IWineD3DPixelShaderImpl_GetParent, IWineD3DPixelShaderImpl_GetParent,
/*** IWineD3DBaseShader methods ***/ /*** IWineD3DBaseShader methods ***/
IWineD3DPixelShaderImpl_SetFunction, IWineD3DPixelShaderImpl_SetFunction,
/*** IWineD3DPixelShader methods ***/
IWineD3DPixelShaderImpl_GetDevice, IWineD3DPixelShaderImpl_GetDevice,
IWineD3DPixelShaderImpl_GetFunction IWineD3DPixelShaderImpl_GetFunction
/*** IWineD3DPixelShader methods ***/
}; };
void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) { void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) {

2
dlls/wined3d/vertexshader.c
View File

@ -343,9 +343,9 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl =
IWineD3DVertexShaderImpl_GetParent, IWineD3DVertexShaderImpl_GetParent,
/*** IWineD3DBaseShader methods ***/ /*** IWineD3DBaseShader methods ***/
IWineD3DVertexShaderImpl_SetFunction, IWineD3DVertexShaderImpl_SetFunction,
/*** IWineD3DVertexShader methods ***/
IWineD3DVertexShaderImpl_GetDevice, IWineD3DVertexShaderImpl_GetDevice,
IWineD3DVertexShaderImpl_GetFunction, IWineD3DVertexShaderImpl_GetFunction,
/*** IWineD3DVertexShader methods ***/
IWIneD3DVertexShaderImpl_SetLocalConstantsF IWIneD3DVertexShaderImpl_SetLocalConstantsF
}; };

21
include/wine/wined3d.idl
View File

@ -2838,6 +2838,13 @@ interface IWineD3DBaseShader : IWineD3DBase
[in] const DWORD *function, [in] const DWORD *function,
[in] const struct wined3d_shader_signature *output_signature [in] const struct wined3d_shader_signature *output_signature
); );
HRESULT GetDevice(
[out] IWineD3DDevice **device
);
HRESULT GetFunction(
[out] void *data,
[in, out] UINT *data_size
);
} }
[ [
@ -2847,13 +2854,6 @@ interface IWineD3DBaseShader : IWineD3DBase
] ]
interface IWineD3DVertexShader : IWineD3DBaseShader interface IWineD3DVertexShader : IWineD3DBaseShader
{ {
HRESULT GetDevice(
[out] IWineD3DDevice **device
);
HRESULT GetFunction(
[out] void *data,
[in, out] UINT *data_size
);
HRESULT SetLocalConstantsF( HRESULT SetLocalConstantsF(
[in] UINT start_idx, [in] UINT start_idx,
[in] const float *src_data, [in] const float *src_data,
@ -2868,13 +2868,6 @@ interface IWineD3DVertexShader : IWineD3DBaseShader
] ]
interface IWineD3DPixelShader : IWineD3DBaseShader interface IWineD3DPixelShader : IWineD3DBaseShader
{ {
HRESULT GetDevice(
[out] IWineD3DDevice **device
);
HRESULT GetFunction(
[out] void *data,
[in, out] UINT *data_size
);
} }
[ [