[PATCH 2/5] d3d10: Implement d3d10_effect_shader_variable_GetVertexShader().

Henri Verbeet hverbeet at codeweavers.com
Thu Sep 20 15:59:19 CDT 2012


---
 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 df284e9..0d8bd0e 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -5617,9 +5617,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc(
 static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader(
         ID3D10EffectShaderVariable *iface, UINT index, ID3D10VertexShader **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_VERTEXSHADER)
+    {
+        WARN("Shader is not a vertex shader.\n");
+        return E_FAIL;
+    }
+
+    s = v->data;
+    if ((*shader = s->shader.vs))
+        ID3D10VertexShader_AddRef(*shader);
+
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader(
-- 
1.7.8.6




More information about the wine-patches mailing list