Skip to content

W
wine-winehq
Commit a1c2cd01 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

d3d11: Add support for returning multiple scissor rectangles.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3ee3324c
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 36 deletions
dlls/d3d10core/tests/device.c
View file @ a1c2cd01
......@@ -4924,7 +4924,7 @@ float4 main(float4 color : COLOR) : SV_TARGET
ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv);
ID3D10Device_RSGetScissorRects(device, &count, NULL);
todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count);
ok(!count, "Got unexpected scissor rect count %u.\n", count);
memset(tmp_rect, 0x55, sizeof(tmp_rect));
count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
ID3D10Device_RSGetScissorRects(device, &count, tmp_rect);
......@@ -5316,7 +5316,7 @@ float4 main(float4 color : COLOR) : SV_TARGET
ID3D10DepthStencilView_Release(tmp_dsv);
ID3D10Device_RSGetScissorRects(device, &count, NULL);
todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
"Got unexpected scissor rect count %u.\n", count);
memset(tmp_rect, 0x55, sizeof(tmp_rect));
ID3D10Device_RSGetScissorRects(device, &count, tmp_rect);
......@@ -5455,16 +5455,15 @@ float4 main(float4 color : COLOR) : SV_TARGET
ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv);
ID3D10Device_RSGetScissorRects(device, &count, NULL);
todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count);
ok(!count, "Got unexpected scissor rect count %u.\n", count);
memset(tmp_rect, 0x55, sizeof(tmp_rect));
count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
ID3D10Device_RSGetScissorRects(device, &count, tmp_rect);
for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i)
{
todo_wine_if(!i)
ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom,
"Got unexpected scissor rect %s in slot %u.\n",
wine_dbgstr_rect(&tmp_rect[i]), i);
ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom,
"Got unexpected scissor rect %s in slot %u.\n",
wine_dbgstr_rect(&tmp_rect[i]), i);
}
ID3D10Device_RSGetViewports(device, &count, NULL);
ok(!count, "Got unexpected viewport count %u.\n", count);
......
dlls/d3d11/device.c
View file @ a1c2cd01
......@@ -2127,23 +2127,25 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De
UINT *rect_count, D3D11_RECT *rects)
{
struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
unsigned int actual_count;
TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects);
if (!rect_count)
return;
wined3d_mutex_lock();
wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects);
wined3d_mutex_unlock();
if (!rects)
{
*rect_count = 1;
*rect_count = actual_count;
return;
}
if (!*rect_count)
return;
wined3d_mutex_lock();
wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rects);
wined3d_mutex_unlock();
if (*rect_count > 1)
memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects));
if (*rect_count > actual_count)
memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects));
}
static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext *iface,
......@@ -4930,23 +4932,25 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface,
static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *iface, UINT *rect_count, D3D10_RECT *rects)
{
struct d3d_device *device = impl_from_ID3D10Device(iface);
unsigned int actual_count;
TRACE("iface %p, rect_count %p, rects %p.\n", iface, rect_count, rects);
if (!rect_count)
return;
wined3d_mutex_lock();
wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects);
wined3d_mutex_unlock();
if (!rects)
{
*rect_count = 1;
*rect_count = actual_count;
return;
}
if (!*rect_count)
return;
wined3d_mutex_lock();
wined3d_device_get_scissor_rects(device->wined3d_device, NULL, rects);
wined3d_mutex_unlock();
if (*rect_count > 1)
memset(&rects[1], 0, (*rect_count - 1) * sizeof(*rects));
if (*rect_count > actual_count)
memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects));
}
static HRESULT STDMETHODCALLTYPE d3d10_device_GetDeviceRemovedReason(ID3D10Device1 *iface)
......
dlls/d3d11/tests/d3d11.c
View file @ a1c2cd01
......@@ -9808,7 +9808,7 @@ static void test_clear_state(void)
}
ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL);
todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count);
ok(!count, "Got unexpected scissor rect count %u.\n", count);
memset(tmp_rect, 0x55, sizeof(tmp_rect));
count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect);
......@@ -10337,7 +10337,7 @@ static void test_clear_state(void)
ID3D11UnorderedAccessView_Release(tmp_uav[i]);
ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL);
todo_wine ok(count == D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
ok(count == D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
"Got unexpected scissor rect count %u.\n", count);
memset(tmp_rect, 0x55, sizeof(tmp_rect));
ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect);
......@@ -10557,7 +10557,7 @@ static void test_clear_state(void)
}
ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL);
todo_wine ok(!count, "Got unexpected scissor rect count %u.\n", count);
ok(!count, "Got unexpected scissor rect count %u.\n", count);
memset(tmp_rect, 0x55, sizeof(tmp_rect));
count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect);
dlls/d3dx10_43/tests/d3dx10.c
View file @ a1c2cd01
......@@ -510,20 +510,19 @@ float4 main(float4 color : COLOR) : SV_TARGET
ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv);
ID3D10Device_RSGetScissorRects(device, &count, NULL);
todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
"Got unexpected scissor rect count %u.\n", count);
memset(tmp_rect, 0x55, sizeof(tmp_rect));
count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
ID3D10Device_RSGetScissorRects(device, &count, tmp_rect);
for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i)
{
todo_wine_if(i)
ok(tmp_rect[i].left == i
&& tmp_rect[i].top == i * 2
&& tmp_rect[i].right == i + 1
&& tmp_rect[i].bottom == (i + 1) * 2,
"Got unexpected scissor rect %s in slot %u.\n",
wine_dbgstr_rect(&tmp_rect[i]), i);
ok(tmp_rect[i].left == i
&& tmp_rect[i].top == i * 2
&& tmp_rect[i].right == i + 1
&& tmp_rect[i].bottom == (i + 1) * 2,
"Got unexpected scissor rect %s in slot %u.\n",
wine_dbgstr_rect(&tmp_rect[i]), i);
}
ID3D10Device_RSGetViewports(device, &count, NULL);
ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
......
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