Henri Verbeet : wined3d: Move some common shader functions to the IWineD3DBaseShader interface.
Alexandre Julliard
julliard at winehq.org
Fri Sep 25 10:25:18 CDT 2009
Module: wine
Branch: master
Commit: d76c7a8521f7088e0e2f963bc1e95ac0c732f36d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76c7a8521f7088e0e2f963bc1e95ac0c732f36d
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Sep 25 13:31:42 2009 +0200
wined3d: Move some common shader functions to the IWineD3DBaseShader interface.
---
dlls/wined3d/pixelshader.c | 2 +-
dlls/wined3d/vertexshader.c | 2 +-
include/wine/wined3d.idl | 21 +++++++--------------
3 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 89d7a13..74e1559 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -354,9 +354,9 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl =
IWineD3DPixelShaderImpl_GetParent,
/*** IWineD3DBaseShader methods ***/
IWineD3DPixelShaderImpl_SetFunction,
- /*** IWineD3DPixelShader methods ***/
IWineD3DPixelShaderImpl_GetDevice,
IWineD3DPixelShaderImpl_GetFunction
+ /*** IWineD3DPixelShader methods ***/
};
void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) {
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 0a5bf40..1a6a884 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -343,9 +343,9 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl =
IWineD3DVertexShaderImpl_GetParent,
/*** IWineD3DBaseShader methods ***/
IWineD3DVertexShaderImpl_SetFunction,
- /*** IWineD3DVertexShader methods ***/
IWineD3DVertexShaderImpl_GetDevice,
IWineD3DVertexShaderImpl_GetFunction,
+ /*** IWineD3DVertexShader methods ***/
IWIneD3DVertexShaderImpl_SetLocalConstantsF
};
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index e39a880..55f87ea 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2838,6 +2838,13 @@ interface IWineD3DBaseShader : IWineD3DBase
[in] const DWORD *function,
[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
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
- HRESULT GetFunction(
- [out] void *data,
- [in, out] UINT *data_size
- );
HRESULT SetLocalConstantsF(
[in] UINT start_idx,
[in] const float *src_data,
@@ -2868,13 +2868,6 @@ interface IWineD3DVertexShader : IWineD3DBaseShader
]
interface IWineD3DPixelShader : IWineD3DBaseShader
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
- HRESULT GetFunction(
- [out] void *data,
- [in, out] UINT *data_size
- );
}
[
More information about the wine-cvs
mailing list