From 7cea4645c56257143fe93665a0aa26c469a354d4 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Mon, 8 Oct 2012 21:32:39 +0200
Subject: [PATCH] d3d10: Implement d3d10_effect_sampler_variable_GetSampler().

---
 dlls/d3d10/d3d10_private.h |  1 +
 dlls/d3d10/effect.c        | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index 9449da18d72..dbd72baf55d 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -117,6 +117,7 @@ struct d3d10_effect_state_object_variable
         ID3D10RasterizerState *rasterizer;
         ID3D10DepthStencilState *depth_stencil;
         ID3D10BlendState *blend;
+        ID3D10SamplerState *sampler;
     } object;
 };
 
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 1afa0b520c5..c465c43ec96 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -1608,6 +1608,9 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v)
             break;
 
         case D3D10_SVT_SAMPLER:
+            if (FAILED(hr = ID3D10Device_CreateSamplerState(device,
+                    &v->u.state.desc.sampler, &v->u.state.object.sampler)))
+                return hr;
             break;
 
         default:
@@ -6778,9 +6781,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetRawValue(ID3D1
 static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetSampler(ID3D10EffectSamplerVariable *iface,
         UINT index, ID3D10SamplerState **sampler)
 {
-    FIXME("iface %p, index %u, sampler %p stub!\n", iface, index, sampler);
+    struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface);
 
-    return E_NOTIMPL;
+    TRACE("iface %p, index %u, sampler %p.\n", iface, index, sampler);
+
+    if (v->type->element_count)
+        v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index));
+    else if (index)
+        return E_FAIL;
+
+    if (v->type->basetype != D3D10_SVT_SAMPLER)
+    {
+        WARN("Variable is not a sampler state.\n");
+        return E_FAIL;
+    }
+
+    if ((*sampler = v->u.state.object.sampler))
+        ID3D10SamplerState_AddRef(*sampler);
+
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(ID3D10EffectSamplerVariable *iface,