Module: wine Branch: master Commit: 607da49d473166452741d76d50b6dd36b554a9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=607da49d473166452741d76d50...
Author: Christian Costa titan.costa@gmail.com Date: Thu Jul 21 09:06:42 2016 +0000
include: Fix prototypes of D3DXFillXXXTextureTx for d3dx9.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/d3dx9tex.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 542460f..77f2d35 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -337,12 +337,9 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *cube, LPD3DXFILL3D function, void *data); HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *volume, LPD3DXFILL3D function, void *data);
-HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, const DWORD *function, - const D3DXVECTOR4 *constants, UINT numconstants); -HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, const DWORD *function, - const D3DXVECTOR4 *constants, UINT numconstants); -HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, const DWORD *function, - const D3DXVECTOR4 *constants, UINT numconstants); +HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTextureShader *texture_shader); +HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, ID3DXTextureShader *texture_shader); +HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, ID3DXTextureShader *texture_shader);
HRESULT WINAPI D3DXComputeNormalMap(IDirect3DTexture9 *texture, IDirect3DTexture9 *srctexture, const PALETTEENTRY *srcpalette, DWORD flags, DWORD channel, float amplitude);
-
Alexandre Julliard