Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPixelShader() helper.
Alexandre Julliard
julliard at winehq.org
Thu Mar 14 18:33:21 CDT 2019
Module: wine
Branch: master
Commit: 7ce336969ca4f7adba33c45f5f746a8f656348cc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce336969ca4f7adba33c45f5f746a8f656348cc
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Wed Mar 13 00:10:53 2019 +0100
d3dx9: Merge the d3dx_effect_GetPixelShader() helper.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/effect.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 993e613..554d43d 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1582,24 +1582,6 @@ static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
-static HRESULT d3dx9_base_effect_get_pixel_shader(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER)
- {
- if ((*shader = *(struct IDirect3DPixelShader9 **)param->data))
- IDirect3DPixelShader9_AddRef(*shader);
- TRACE("Returning %p.\n", *shader);
- return D3D_OK;
- }
-
- WARN("Parameter not found.\n");
-
- return D3DERR_INVALIDCALL;
-}
-
static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader)
{
@@ -3606,13 +3588,24 @@ static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHAND
}
static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter,
- struct IDirect3DPixelShader9 **shader)
+ IDirect3DPixelShader9 **shader)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+ struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader);
- return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader);
+ if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER)
+ {
+ if ((*shader = *(IDirect3DPixelShader9 **)param->data))
+ IDirect3DPixelShader9_AddRef(*shader);
+ TRACE("Returning %p.\n", *shader);
+ return D3D_OK;
+ }
+
+ WARN("Parameter not found.\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter,
More information about the wine-cvs
mailing list