From 232834a572b3f3d23926c7266e719c3b31ac91b2 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sun, 17 Apr 2016 19:07:56 +0200 Subject: [PATCH] d3d11: Support NULL views in d3d10_device_ClearRenderTargetView(). Signed-off-by: Alistair Leslie-Hughes Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d10core/tests/device.c | 9 +++++++++ dlls/d3d11/device.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ea9845c3d71..106e4cc2dba 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6079,6 +6079,7 @@ static void test_clear_render_target_view(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; struct d3d10core_test_context test_context; ID3D10Texture2D *texture, *srgb_texture; @@ -6123,6 +6124,14 @@ static void test_clear_render_target_view(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); + if (d3d11_available) + { + ID3D10Device_ClearRenderTargetView(device, NULL, green); + check_texture_color(texture, expected_color, 1); + } + else + win_skip("D3D11 is not available, skipping test.\n"); + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4a83882a541..fd88ac185b8 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))) -- 2.11.4.GIT