[PATCH 1/7] d3dx9: Merge the d3dx_effect_GetVertexShader() helper
Michael Stefaniuc
mstefani at winehq.org
Fri Mar 15 16:39:11 CDT 2019
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/d3dx9_36/effect.c | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 0a5294099e..d2e03f50d4 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1177,24 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string)
return D3D_OK;
}
-static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base,
- D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader)
-{
- struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
- if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER)
- {
- if ((*shader = *(struct IDirect3DVertexShader9 **)param->data))
- IDirect3DVertexShader9_AddRef(*shader);
- TRACE("Returning %p.\n", *shader);
- return D3D_OK;
- }
-
- WARN("Parameter not found.\n");
-
- return D3DERR_INVALIDCALL;
-}
-
static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value)
{
static const struct
@@ -3533,14 +3515,25 @@ static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE
return D3DERR_INVALIDCALL;
}
-static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter,
- struct IDirect3DVertexShader9 **shader)
+static HRESULT WINAPI d3dx_effect_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE parameter,
+ IDirect3DVertexShader9 **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_vertex_shader(&effect->base_effect, parameter, shader);
+ if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER)
+ {
+ if ((*shader = *(IDirect3DVertexShader9 **)param->data))
+ IDirect3DVertexShader9_AddRef(*shader);
+ TRACE("Returning %p.\n", *shader);
+ return D3D_OK;
+ }
+
+ WARN("Parameter not found.\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end)
--
2.20.1
More information about the wine-devel
mailing list