[ros-diffs] [reactos] 62/218: [WINESYNC] d3dx9: Merge the d3dx_effect_GetPixelShader() helper.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dec26184713cfa927a38…

commit 6dec26184713cfa927a381398f7b2d6fdcb0075b
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 22:40:28 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:02 2021 +0100

    [WINESYNC] d3dx9: Merge the d3dx_effect_GetPixelShader() helper.
    
    Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 7ce336969ca4f7adba33c45f5f746a8f656348cc by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 33 +++++++++++++--------------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index b307c827721..dedb9a867b8 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -1586,24 +1586,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)
 {
@@ -3610,13 +3592,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,
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 90c9dafb656..4f4bd100d09 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -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/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}
-tags: {wine: 262238d46752700c2041cb9548724c66bd017eca}
+tags: {wine: 7ce336969ca4f7adba33c45f5f746a8f656348cc}