Commit f3bbf323 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

d3d11: Support NULL RenderTargetView pointer in ClearRenderTargetView.

parent da5cc1ec
...@@ -967,6 +967,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D ...@@ -967,6 +967,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D
TRACE("iface %p, render_target_view %p, color_rgba %s.\n", TRACE("iface %p, render_target_view %p, color_rgba %s.\n",
iface, render_target_view, debug_float4(color_rgba)); iface, render_target_view, debug_float4(color_rgba));
if (!view)
return;
wined3d_mutex_lock(); wined3d_mutex_lock();
if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL,
WINED3DCLEAR_TARGET, &color, 0.0f, 0))) WINED3DCLEAR_TARGET, &color, 0.0f, 0)))
......
...@@ -5824,6 +5824,7 @@ static void test_clear_render_target_view(void) ...@@ -5824,6 +5824,7 @@ static void test_clear_render_target_view(void)
{ {
static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; 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 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; ID3D11Texture2D *texture, *srgb_texture;
struct d3d11_test_context test_context; struct d3d11_test_context test_context;
...@@ -5870,6 +5871,9 @@ static void test_clear_render_target_view(void) ...@@ -5870,6 +5871,9 @@ static void test_clear_render_target_view(void)
ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color);
check_texture_color(texture, expected_color, 1); 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); ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color);
check_texture_color(srgb_texture, expected_srgb_color, 1); check_texture_color(srgb_texture, expected_srgb_color, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment