Henri Verbeet : d3d10: Implement d3d10_effect_shader_variable_GetPixelShader().

Alexandre Julliard julliard at winehq.org
Mon Sep 24 16:04:24 CDT 2012


Module: wine
Branch: master
Commit: 1dcc63c170742d813f8685f4c3e850c9b1058ae9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1dcc63c170742d813f8685f4c3e850c9b1058ae9

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Sun Sep 23 22:14:46 2012 +0200

d3d10: Implement d3d10_effect_shader_variable_GetPixelShader().

---

 dlls/d3d10/effect.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 902bf5a..edb216b 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -5665,9 +5665,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader(
 static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader(
         ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader)
 {
-    FIXME("iface %p, index %u, shader %p stub!\n", iface, index, shader);
+    struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface);
+    struct d3d10_effect_shader_variable *s;
 
-    return E_NOTIMPL;
+    TRACE("iface %p, index %u, shader %p.\n", iface, index, shader);
+
+    if (v->type->element_count)
+        v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index));
+
+    if (v->type->basetype != D3D10_SVT_PIXELSHADER)
+    {
+        WARN("Shader is not a pixel shader.\n");
+        return E_FAIL;
+    }
+
+    s = v->data;
+    if ((*shader = s->shader.ps))
+        ID3D10PixelShader_AddRef(*shader);
+
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureElementDesc(




More information about the wine-cvs mailing list