[v2 PATCH 2/2] d3d11: Support NULL RenderTargetView pointer in ClearRenderTargetView
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Tue Apr 12 05:22:29 CDT 2016
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/d3d11/device.c | 3 +++
dlls/d3d11/tests/d3d11.c | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index cb9c9bd..f0bd10c 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -967,6 +967,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D
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)))
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index a844c11..ee7103d 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -5824,6 +5824,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};
ID3D11Texture2D *texture, *srgb_texture;
struct d3d11_test_context test_context;
@@ -5870,6 +5871,9 @@ static void test_clear_render_target_view(void)
ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color);
check_texture_color(texture, expected_color, 1);
+ ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green);
+ check_texture_color(texture, expected_color, 1);
+
ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color);
check_texture_color(srgb_texture, expected_srgb_color, 1);
--
2.8.0.rc3
More information about the wine-patches
mailing list