mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-24 12:03:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_GetTexture() helper.

Browse Source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id f06d6ab0858db398576e36bf295be581952d6209 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:28 +02:00 committed by Jérôme Gardou
parent 598c2e03b2
commit 13e4a05754
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dll/directx/wine/d3dx9_36/effect.c
View File

@ -1532,27 +1532,6 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (texture && param && !param->element_count &&
(param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D
|| param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D
|| param->type == D3DXPT_TEXTURECUBE))
{
*texture = *(struct IDirect3DBaseTexture9 **)param->data;
if (*texture) IDirect3DBaseTexture9_AddRef(*texture);
TRACE("Returning %p\n", *texture);
return D3D_OK;
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader)
{ {
@ -3567,14 +3546,29 @@ static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHAND
return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture);
} }
static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter,
struct IDirect3DBaseTexture9 **texture) IDirect3DBaseTexture9 **texture)
{ {
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture);
return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); if (texture && param && !param->element_count
&& (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D
|| param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D
|| param->type == D3DXPT_TEXTURECUBE))
{
*texture = *(IDirect3DBaseTexture9 **)param->data;
if (*texture)
IDirect3DBaseTexture9_AddRef(*texture);
TRACE("Returning %p.\n", *texture);
return D3D_OK;
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
} }
static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter,

2
sdk/tools/winesync/d3dx9.cfg
View File

@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: e288158dec12f4f55aea01fb1e2879c6e9a18028} tags: {wine: f06d6ab0858db398576e36bf295be581952d6209}