Henri Verbeet : wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Aug 21 15:42:12 CDT 2014


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Aug 21 09:55:54 2014 +0200

wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources.

---

 dlls/wined3d/device.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 1f5a46c..962c9c8 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3741,22 +3741,32 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device,
 }
 
 void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device,
-        struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color)
+        struct wined3d_rendertarget_view *view, const struct wined3d_color *color)
 {
     struct wined3d_resource *resource;
     HRESULT hr;
     RECT rect;
 
-    resource = rendertarget_view->resource;
-    if (resource->type != WINED3D_RTYPE_SURFACE)
+    TRACE("device %p, view %p, color {%.8e, %.8e, %.8e, %.8e}.\n",
+            device, view, color->r, color->g, color->b, color->a);
+
+    resource = view->resource;
+    if (resource->type != WINED3D_RTYPE_TEXTURE && resource->type != WINED3D_RTYPE_CUBE_TEXTURE)
+    {
+        FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type));
+        return;
+    }
+
+    if (view->depth > 1)
     {
-        FIXME("Only supported on surface resources\n");
+        FIXME("Layered clears not implemented.\n");
         return;
     }
 
-    SetRect(&rect, 0, 0, resource->width, resource->height);
-    hr = surface_color_fill(surface_from_resource(resource), &rect, color);
-    if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr);
+    SetRect(&rect, 0, 0, view->width, view->height);
+    resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(resource), view->sub_resource_idx);
+    if (FAILED(hr = surface_color_fill(surface_from_resource(resource), &rect, color)))
+        ERR("Color fill failed, hr %#x.\n", hr);
 }
 
 struct wined3d_surface * CDECL wined3d_device_get_render_target(const struct wined3d_device *device,




More information about the wine-cvs mailing list