Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetExtendModeX().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Apr 27 16:39:32 2015 +0200

d2d1: Implement d2d_bitmap_brush_SetExtendModeX().

---

 dlls/d2d1/brush.c        | 35 +++++++++++++++++++++++++++++++++--
 dlls/d2d1/d2d1_private.h |  1 +
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
index f2cb99e..b6702c0 100644
--- a/dlls/d2d1/brush.c
+++ b/dlls/d2d1/brush.c
@@ -555,7 +555,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_GetTransform(ID2D1BitmapBrush *if
 
 static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode)
 {
-    FIXME("iface %p, mode %#x stub!\n", iface, mode);
+    struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface);
+
+    TRACE("iface %p, mode %#x.\n", iface, mode);
+
+    brush->u.bitmap.extend_mode_x = mode;
+    if (brush->u.bitmap.sampler_state)
+    {
+        ID3D10SamplerState_Release(brush->u.bitmap.sampler_state);
+        brush->u.bitmap.sampler_state = NULL;
+    }
 }
 
 static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode)
@@ -646,9 +655,15 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar
             brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl);
     brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap);
     if (bitmap_brush_desc)
+    {
+        brush->u.bitmap.extend_mode_x = bitmap_brush_desc->extendModeX;
         brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode;
+    }
     else
+    {
+        brush->u.bitmap.extend_mode_x = D2D1_EXTEND_MODE_CLAMP;
         brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR;
+    }
 
     return S_OK;
 }
@@ -663,6 +678,22 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface)
     return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
 }
 
+static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTEND_MODE mode)
+{
+    switch (mode)
+    {
+        case D2D1_EXTEND_MODE_CLAMP:
+            return D3D10_TEXTURE_ADDRESS_CLAMP;
+        case D2D1_EXTEND_MODE_WRAP:
+            return D3D10_TEXTURE_ADDRESS_WRAP;
+        case D2D1_EXTEND_MODE_MIRROR:
+            return D3D10_TEXTURE_ADDRESS_MIRROR;
+        default:
+            FIXME("Unhandled extend mode %#x.\n", mode);
+            return D3D10_TEXTURE_ADDRESS_CLAMP;
+    }
+}
+
 void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device)
 {
     HRESULT hr;
@@ -678,7 +709,7 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device)
                 sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT;
             else
                 sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR;
-            sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP;
+            sampler_desc.AddressU = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_x);
             sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP;
             sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP;
             sampler_desc.MipLODBias = 0.0f;
diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
index 285c422..b5820d0 100644
--- a/dlls/d2d1/d2d1_private.h
+++ b/dlls/d2d1/d2d1_private.h
@@ -125,6 +125,7 @@ struct d2d_brush
         struct
         {
             struct d2d_bitmap *bitmap;
+            D2D1_EXTEND_MODE extend_mode_x;
             D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode;
             ID3D10SamplerState *sampler_state;
         } bitmap;