[PATCH 4/4] d3d10core: Support NULL RenderTargetView pointer in ClearRenderTargetView
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Tue Apr 12 02:52:58 CDT 2016
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/d3d10core/tests/device.c | 4 ++++
dlls/d3d11/device.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index e43b6e6..9f6c90d 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -5030,6 +5030,7 @@ static void test_update_subresource(void)
0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e,
};
static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f};
+ static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f};
static const DWORD bitmap_data[] =
{
0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00,
@@ -5095,6 +5096,9 @@ static void test_update_subresource(void)
ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red);
check_texture_color(test_context.backbuffer, 0x7f0000ff, 1);
+ ID3D10Device_ClearRenderTargetView(device, NULL, green);
+ check_texture_color(test_context.backbuffer, 0x7f0000ff, 1);
+
draw_quad(&test_context);
check_texture_color(test_context.backbuffer, 0x00000000, 0);
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 20135b3..45688b1 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -3445,6 +3445,9 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 *
TRACE("iface %p, render_target_view %p, color_rgba %s.\n",
iface, render_target_view, debug_float4(color_rgba));
+ if (!view)
+ return;
+
wined3d_mutex_lock();
if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL,
WINED3DCLEAR_TARGET, &color, 0.0f, 0)))
--
1.9.1
More information about the wine-patches
mailing list