wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Test ClearRenderTargetView() with R8G8B8A8_{SINT, UINT} formats.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jactry Zeng 2019-07-30 11:40:28 +02:00 committed by Alexandre Julliard
parent b1c417a578
commit 5b8c4e57f1
2 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
tests/d3d12.c
View File

@ -4292,6 +4292,7 @@ static void test_clear_render_target_view(void)
{1.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f, 1.0f},
{0.0f, 0.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f},
}; };
static const float negative_value[] = {1.0f, -1.0f, -0.5f, -2.0f};
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, 1.0f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f};
ID3D12GraphicsCommandList *command_list; ID3D12GraphicsCommandList *command_list;
@ -4312,6 +4313,28 @@ static void test_clear_render_target_view(void)
D3D12_BOX box; D3D12_BOX box;
HRESULT hr; HRESULT hr;
static const struct
{
const float *color;
DXGI_FORMAT format;
uint32_t result;
}
r8g8b8a8[] =
{
{color, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 0xbf95bc59},
{green, DXGI_FORMAT_R8G8B8A8_UNORM, 0xff00ff00},
{color, DXGI_FORMAT_R8G8B8A8_UNORM, 0xbf4c7f19},
{green, DXGI_FORMAT_R8G8B8A8_UINT, 0x01000100},
{color, DXGI_FORMAT_R8G8B8A8_UINT, 0x00000000},
{negative_value, DXGI_FORMAT_R8G8B8A8_UINT, 0x00000001},
{green, DXGI_FORMAT_R8G8B8A8_SINT, 0x01000100},
{color, DXGI_FORMAT_R8G8B8A8_SINT, 0x00000000},
{negative_value, DXGI_FORMAT_R8G8B8A8_SINT, 0xfe00ff01},
};
STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors)); STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors));
memset(&desc, 0, sizeof(desc)); memset(&desc, 0, sizeof(desc));
@ -4355,37 +4378,32 @@ static void test_clear_render_target_view(void)
ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
memset(&rtv_desc, 0, sizeof(rtv_desc)); memset(&rtv_desc, 0, sizeof(rtv_desc));
rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D;
ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); /* R8G8B8A8 */
transition_resource_state(command_list, resource, for (i = 0; i < ARRAY_SIZE(r8g8b8a8); ++i)
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); {
check_sub_resource_uint(resource, 0, queue, command_list, 0xff00ff00, 0); vkd3d_test_set_context("Test %u", i);
reset_command_list(command_list, context.allocator); rtv_desc.Format = r8g8b8a8[i].format;
transition_resource_state(command_list, resource, ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, r8g8b8a8[i].color, 0, NULL);
transition_resource_state(command_list, resource, transition_resource_state(command_list, resource,
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
check_sub_resource_uint(resource, 0, queue, command_list, 0xbf4c7f19, 2); todo_if(rtv_desc.Format == DXGI_FORMAT_R8G8B8A8_UINT || rtv_desc.Format == DXGI_FORMAT_R8G8B8A8_SINT)
check_sub_resource_uint(resource, 0, queue, command_list, r8g8b8a8[i].result, 2);
/* sRGB view */ reset_command_list(command_list, context.allocator);
reset_command_list(command_list, context.allocator); transition_resource_state(command_list, resource,
transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);
D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); }
rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; vkd3d_test_set_context(NULL);
ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle);
ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL);
transition_resource_state(command_list, resource,
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2);
/* 2D array texture */ /* 2D array texture */
hr = ID3D12GraphicsCommandList_Close(command_list);
ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr);
reset_command_list(command_list, context.allocator);
ID3D12Resource_Release(resource); ID3D12Resource_Release(resource);
resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors); resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors);
hr = ID3D12Device_CreateCommittedResource(device, hr = ID3D12Device_CreateCommittedResource(device,
@ -4394,7 +4412,6 @@ static void test_clear_render_target_view(void)
&IID_ID3D12Resource, (void **)&resource); &IID_ID3D12Resource, (void **)&resource);
ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr);
reset_command_list(command_list, context.allocator);
for (i = 0; i < ARRAY_SIZE(array_colors); ++i) for (i = 0; i < ARRAY_SIZE(array_colors); ++i)
{ {
memset(&rtv_desc, 0, sizeof(rtv_desc)); memset(&rtv_desc, 0, sizeof(rtv_desc));

4
tests/d3d12_test_utils.h
View File

@ -88,9 +88,9 @@ static inline void reset_command_list_(unsigned int line,
HRESULT hr; HRESULT hr;
hr = ID3D12CommandAllocator_Reset(allocator); hr = ID3D12CommandAllocator_Reset(allocator);
ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); assert_that_(line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr);
hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL);
ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); assert_that_(line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr);
} }
#define queue_signal(a, b, c) queue_signal_(__LINE__, a, b, c) #define queue_signal(a, b, c) queue_signal_(__LINE__, a, b, c)