July 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 5/6] tests: Prefer C99 bool.
by Józef Kucia 18 Jul '19

18 Jul '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 230 +++++++++++++++++++++++++------------------------- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c53d6053de1c..c22607764b6e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -958,10 +958,10 @@ static void test_create_device(void) return; } - check_interface(device, &IID_ID3D12Object, TRUE); - check_interface(device, &IID_ID3D12DeviceChild, FALSE); - check_interface(device, &IID_ID3D12Pageable, FALSE); - check_interface(device, &IID_ID3D12Device, TRUE); + check_interface(device, &IID_ID3D12Object, true); + check_interface(device, &IID_ID3D12DeviceChild, false); + check_interface(device, &IID_ID3D12Pageable, false); + check_interface(device, &IID_ID3D12Device, true); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); @@ -1356,12 +1356,12 @@ static void test_multisample_quality_levels(void) /* invalid sample counts */ for (i = 1; i <= 32; ++i) { - BOOL valid_sample_count = FALSE; + bool valid_sample_count = false; for (j = 0; j < ARRAY_SIZE(sample_counts); ++j) { if (sample_counts[j] == i) { - valid_sample_count = TRUE; + valid_sample_count = true; break; } } @@ -1434,10 +1434,10 @@ static void test_create_command_allocator(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(command_allocator, &IID_ID3D12Object, TRUE); - check_interface(command_allocator, &IID_ID3D12DeviceChild, TRUE); - check_interface(command_allocator, &IID_ID3D12Pageable, TRUE); - check_interface(command_allocator, &IID_ID3D12CommandAllocator, TRUE); + check_interface(command_allocator, &IID_ID3D12Object, true); + check_interface(command_allocator, &IID_ID3D12DeviceChild, true); + check_interface(command_allocator, &IID_ID3D12Pageable, true); + check_interface(command_allocator, &IID_ID3D12CommandAllocator, true); refcount = ID3D12CommandAllocator_Release(command_allocator); ok(!refcount, "ID3D12CommandAllocator has %u references left.\n", (unsigned int)refcount); @@ -1509,12 +1509,12 @@ static void test_create_command_list(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(command_list, &IID_ID3D12Object, TRUE); - check_interface(command_list, &IID_ID3D12DeviceChild, TRUE); - check_interface(command_list, &IID_ID3D12Pageable, FALSE); - check_interface(command_list, &IID_ID3D12CommandList, TRUE); - check_interface(command_list, &IID_ID3D12GraphicsCommandList, TRUE); - check_interface(command_list, &IID_ID3D12CommandAllocator, FALSE); + check_interface(command_list, &IID_ID3D12Object, true); + check_interface(command_list, &IID_ID3D12DeviceChild, true); + check_interface(command_list, &IID_ID3D12Pageable, false); + check_interface(command_list, &IID_ID3D12CommandList, true); + check_interface(command_list, &IID_ID3D12GraphicsCommandList, true); + check_interface(command_list, &IID_ID3D12CommandAllocator, false); refcount = ID3D12CommandList_Release(command_list); ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount); @@ -1530,7 +1530,7 @@ static void test_create_command_list(void) hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_BUNDLE, command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list); ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - check_interface(command_list, &IID_ID3D12GraphicsCommandList, TRUE); + check_interface(command_list, &IID_ID3D12GraphicsCommandList, true); refcount = ID3D12CommandList_Release(command_list); ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount); refcount = ID3D12CommandAllocator_Release(command_allocator); @@ -1545,7 +1545,7 @@ static void test_create_command_list(void) hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COMPUTE, command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list); ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - check_interface(command_list, &IID_ID3D12GraphicsCommandList, TRUE); + check_interface(command_list, &IID_ID3D12GraphicsCommandList, true); refcount = ID3D12CommandList_Release(command_list); ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount); refcount = ID3D12CommandAllocator_Release(command_allocator); @@ -1563,7 +1563,7 @@ static void test_create_command_list(void) hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COPY, command_allocator, NULL, &IID_ID3D12CommandList, (void **)&command_list); ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); - check_interface(command_list, &IID_ID3D12GraphicsCommandList, TRUE); + check_interface(command_list, &IID_ID3D12GraphicsCommandList, true); refcount = ID3D12CommandList_Release(command_list); ok(!refcount, "ID3D12CommandList has %u references left.\n", (unsigned int)refcount); refcount = ID3D12CommandAllocator_Release(command_allocator); @@ -1605,10 +1605,10 @@ static void test_create_command_queue(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(queue, &IID_ID3D12Object, TRUE); - check_interface(queue, &IID_ID3D12DeviceChild, TRUE); - check_interface(queue, &IID_ID3D12Pageable, TRUE); - check_interface(queue, &IID_ID3D12CommandQueue, TRUE); + check_interface(queue, &IID_ID3D12Object, true); + check_interface(queue, &IID_ID3D12DeviceChild, true); + check_interface(queue, &IID_ID3D12Pageable, true); + check_interface(queue, &IID_ID3D12CommandQueue, true); result_desc = ID3D12CommandQueue_GetDesc(queue); ok(result_desc.Type == desc.Type, "Got unexpected type %#x.\n", result_desc.Type); @@ -1775,10 +1775,10 @@ static void test_create_committed_resource(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(resource, &IID_ID3D12Object, TRUE); - check_interface(resource, &IID_ID3D12DeviceChild, TRUE); - check_interface(resource, &IID_ID3D12Pageable, TRUE); - check_interface(resource, &IID_ID3D12Resource, TRUE); + check_interface(resource, &IID_ID3D12Object, true); + check_interface(resource, &IID_ID3D12DeviceChild, true); + check_interface(resource, &IID_ID3D12Pageable, true); + check_interface(resource, &IID_ID3D12Resource, true); gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); @@ -1860,10 +1860,10 @@ static void test_create_committed_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); - check_interface(resource, &IID_ID3D12Object, TRUE); - check_interface(resource, &IID_ID3D12DeviceChild, TRUE); - check_interface(resource, &IID_ID3D12Pageable, TRUE); - check_interface(resource, &IID_ID3D12Resource, TRUE); + check_interface(resource, &IID_ID3D12Object, true); + check_interface(resource, &IID_ID3D12DeviceChild, true); + check_interface(resource, &IID_ID3D12Pageable, true); + check_interface(resource, &IID_ID3D12Resource, true); gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); @@ -2010,10 +2010,10 @@ static void test_create_heap(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(heap, &IID_ID3D12Object, TRUE); - check_interface(heap, &IID_ID3D12DeviceChild, TRUE); - check_interface(heap, &IID_ID3D12Pageable, TRUE); - check_interface(heap, &IID_ID3D12Heap, TRUE); + check_interface(heap, &IID_ID3D12Object, true); + check_interface(heap, &IID_ID3D12DeviceChild, true); + check_interface(heap, &IID_ID3D12Pageable, true); + check_interface(heap, &IID_ID3D12Heap, true); result_desc = ID3D12Heap_GetDesc(heap); check_heap_desc(&result_desc, &desc); @@ -2163,10 +2163,10 @@ static void test_create_placed_resource(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(resource, &IID_ID3D12Object, TRUE); - check_interface(resource, &IID_ID3D12DeviceChild, TRUE); - check_interface(resource, &IID_ID3D12Pageable, TRUE); - check_interface(resource, &IID_ID3D12Resource, TRUE); + check_interface(resource, &IID_ID3D12Object, true); + check_interface(resource, &IID_ID3D12DeviceChild, true); + check_interface(resource, &IID_ID3D12Pageable, true); + check_interface(resource, &IID_ID3D12Resource, true); gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); @@ -2266,10 +2266,10 @@ static void test_create_reserved_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr); - check_interface(resource, &IID_ID3D12Object, TRUE); - check_interface(resource, &IID_ID3D12DeviceChild, TRUE); - check_interface(resource, &IID_ID3D12Pageable, TRUE); - check_interface(resource, &IID_ID3D12Resource, TRUE); + check_interface(resource, &IID_ID3D12Object, true); + check_interface(resource, &IID_ID3D12DeviceChild, true); + check_interface(resource, &IID_ID3D12Pageable, true); + check_interface(resource, &IID_ID3D12Resource, true); gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); @@ -2387,10 +2387,10 @@ static void test_create_descriptor_heap(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(heap, &IID_ID3D12Object, TRUE); - check_interface(heap, &IID_ID3D12DeviceChild, TRUE); - check_interface(heap, &IID_ID3D12Pageable, TRUE); - check_interface(heap, &IID_ID3D12DescriptorHeap, TRUE); + check_interface(heap, &IID_ID3D12Object, true); + check_interface(heap, &IID_ID3D12DeviceChild, true); + check_interface(heap, &IID_ID3D12Pageable, true); + check_interface(heap, &IID_ID3D12DescriptorHeap, true); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); @@ -2597,10 +2597,10 @@ static void test_create_root_signature(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(root_signature, &IID_ID3D12Object, TRUE); - check_interface(root_signature, &IID_ID3D12DeviceChild, TRUE); - check_interface(root_signature, &IID_ID3D12Pageable, FALSE); - check_interface(root_signature, &IID_ID3D12RootSignature, TRUE); + check_interface(root_signature, &IID_ID3D12Object, true); + check_interface(root_signature, &IID_ID3D12DeviceChild, true); + check_interface(root_signature, &IID_ID3D12Pageable, false); + check_interface(root_signature, &IID_ID3D12RootSignature, true); refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); @@ -2809,10 +2809,10 @@ static void test_create_compute_pipeline_state(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(pipeline_state, &IID_ID3D12Object, TRUE); - check_interface(pipeline_state, &IID_ID3D12DeviceChild, TRUE); - check_interface(pipeline_state, &IID_ID3D12Pageable, TRUE); - check_interface(pipeline_state, &IID_ID3D12PipelineState, TRUE); + check_interface(pipeline_state, &IID_ID3D12Object, true); + check_interface(pipeline_state, &IID_ID3D12DeviceChild, true); + check_interface(pipeline_state, &IID_ID3D12Pageable, true); + check_interface(pipeline_state, &IID_ID3D12PipelineState, true); refcount = ID3D12PipelineState_Release(pipeline_state); ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); @@ -2875,10 +2875,10 @@ static void test_create_graphics_pipeline_state(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(pipeline_state, &IID_ID3D12Object, TRUE); - check_interface(pipeline_state, &IID_ID3D12DeviceChild, TRUE); - check_interface(pipeline_state, &IID_ID3D12Pageable, TRUE); - check_interface(pipeline_state, &IID_ID3D12PipelineState, TRUE); + check_interface(pipeline_state, &IID_ID3D12Object, true); + check_interface(pipeline_state, &IID_ID3D12DeviceChild, true); + check_interface(pipeline_state, &IID_ID3D12Pageable, true); + check_interface(pipeline_state, &IID_ID3D12PipelineState, true); refcount = ID3D12PipelineState_Release(pipeline_state); ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); @@ -2996,10 +2996,10 @@ static void test_create_fence(void) refcount = ID3D12Device_Release(tmp_device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); - check_interface(fence, &IID_ID3D12Object, TRUE); - check_interface(fence, &IID_ID3D12DeviceChild, TRUE); - check_interface(fence, &IID_ID3D12Pageable, TRUE); - check_interface(fence, &IID_ID3D12Fence, TRUE); + check_interface(fence, &IID_ID3D12Object, true); + check_interface(fence, &IID_ID3D12DeviceChild, true); + check_interface(fence, &IID_ID3D12Pageable, true); + check_interface(fence, &IID_ID3D12Fence, true); value = ID3D12Fence_GetCompletedValue(fence); ok(value == 0, "Got unexpected value %"PRIu64".\n", value); @@ -11419,12 +11419,12 @@ static void test_root_signature_byte_code(void) &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer); ok(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); - check_interface(deserializer, &IID_IUnknown, FALSE); - check_interface(deserializer, &IID_ID3D12RootSignatureDeserializer, TRUE); - check_interface(deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, FALSE); - check_interface(deserializer, &IID_ID3D12Object, FALSE); - check_interface(deserializer, &IID_ID3D12DeviceChild, FALSE); - check_interface(deserializer, &IID_ID3D12Pageable, FALSE); + check_interface(deserializer, &IID_IUnknown, false); + check_interface(deserializer, &IID_ID3D12RootSignatureDeserializer, true); + check_interface(deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, false); + check_interface(deserializer, &IID_ID3D12Object, false); + check_interface(deserializer, &IID_ID3D12DeviceChild, false); + check_interface(deserializer, &IID_ID3D12Pageable, false); refcount = ID3D12RootSignatureDeserializer_Release(deserializer); ok(!refcount, "ID3D12RootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); @@ -11468,12 +11468,12 @@ static void test_root_signature_byte_code(void) &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&versioned_deserializer); ok(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); - check_interface(versioned_deserializer, &IID_IUnknown, FALSE); - check_interface(versioned_deserializer, &IID_ID3D12RootSignatureDeserializer, FALSE); - check_interface(versioned_deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, TRUE); - check_interface(versioned_deserializer, &IID_ID3D12Object, FALSE); - check_interface(versioned_deserializer, &IID_ID3D12DeviceChild, FALSE); - check_interface(versioned_deserializer, &IID_ID3D12Pageable, FALSE); + check_interface(versioned_deserializer, &IID_IUnknown, false); + check_interface(versioned_deserializer, &IID_ID3D12RootSignatureDeserializer, false); + check_interface(versioned_deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, true); + check_interface(versioned_deserializer, &IID_ID3D12Object, false); + check_interface(versioned_deserializer, &IID_ID3D12DeviceChild, false); + check_interface(versioned_deserializer, &IID_ID3D12Pageable, false); refcount = ID3D12VersionedRootSignatureDeserializer_Release(versioned_deserializer); ok(!refcount, "ID3D12VersionedRootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); @@ -21538,7 +21538,7 @@ static void test_atomic_instructions(void) get_buffer_readback_with_command_list(cs_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(instructions); ++j) { - BOOL todo_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax") + bool todo_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax") || !strcmp(imm_instructions[j], "imm_atomic_imin"); unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; @@ -23456,8 +23456,8 @@ static void test_vertex_id(void) {0xf, 2, 9}, }; - BOOL found_values[ARRAY_SIZE(expected_values)] = {0}; - BOOL used_values[ARRAY_SIZE(expected_values)] = {0}; + bool found_values[ARRAY_SIZE(expected_values)] = {0}; + bool used_values[ARRAY_SIZE(expected_values)] = {0}; ID3D12Resource *args_buffer, *indexed_args_buffer; ID3D12CommandSignature *indexed_command_signature; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -23590,8 +23590,8 @@ static void test_vertex_id(void) { if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb, j, 0), &expected_values[i])) { - found_values[i] = TRUE; - used_values[j] = TRUE; + found_values[i] = true; + used_values[j] = true; break; } } @@ -24770,20 +24770,20 @@ static void test_face_culling(void) static const struct { D3D12_CULL_MODE cull_mode; - BOOL front_ccw; - BOOL expected_cw; - BOOL expected_ccw; + bool front_ccw; + bool expected_cw; + bool expected_ccw; } tests[] = { - {D3D12_CULL_MODE_NONE, FALSE, TRUE, TRUE}, - {D3D12_CULL_MODE_NONE, TRUE, TRUE, TRUE}, - {D3D12_CULL_MODE_FRONT, FALSE, FALSE, TRUE}, - {D3D12_CULL_MODE_FRONT, TRUE, TRUE, FALSE}, - {D3D12_CULL_MODE_BACK, FALSE, TRUE, FALSE}, - {D3D12_CULL_MODE_BACK, TRUE, FALSE, TRUE}, + {D3D12_CULL_MODE_NONE, false, true, true}, + {D3D12_CULL_MODE_NONE, true, true, true}, + {D3D12_CULL_MODE_FRONT, false, false, true}, + {D3D12_CULL_MODE_FRONT, true, true, false}, + {D3D12_CULL_MODE_BACK, false, true, false}, + {D3D12_CULL_MODE_BACK, true, false, true}, }; - static const BOOL front_tests[] = {FALSE, TRUE}; + static const bool front_tests[] = {false, true}; memset(&desc, 0, sizeof(desc)); desc.no_root_signature = true; @@ -28176,7 +28176,7 @@ static void test_clip_distance(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct { - BOOL use_constant; + bool use_constant; float clip_distance0; float clip_distance1; float padding; @@ -28259,7 +28259,7 @@ static void test_clip_distance(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); - cb_data.use_constant = TRUE; + cb_data.use_constant = true; cb_data.clip_distance0 = -1.0f; update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); @@ -28273,7 +28273,7 @@ static void test_clip_distance(void) check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); - cb_data.use_constant = TRUE; + cb_data.use_constant = true; cb_data.clip_distance0 = 1.0f; update_buffer_data(gs_cb, 0, sizeof(cb_data), &cb_data); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); @@ -28305,7 +28305,7 @@ static void test_clip_distance(void) &IID_ID3D12PipelineState, (void **)&pso); ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); - cb_data.use_constant = FALSE; + cb_data.use_constant = false; update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); for (i = 0; i < ARRAY_SIZE(vertices); ++i) @@ -28367,7 +28367,7 @@ static void test_clip_distance(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); - cb_data.use_constant = TRUE; + cb_data.use_constant = true; cb_data.clip_distance0 = 0.0f; cb_data.clip_distance1 = 0.0f; update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); @@ -28507,27 +28507,27 @@ static void test_combined_clip_and_cull_distances(void) static const struct test { float vertices[4]; - BOOL triangle_visible[2]; + bool triangle_visible[2]; } cull_distance_tests[] = { - {{-1.0f, 1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, - {{ 1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, - {{ 1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, - {{-1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, - {{-1.0f, 1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, - {{-1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, - {{ 1.0f, -1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, - {{ 1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, - {{ 1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, 1.0f, 1.0f}, {true, true}}, + {{ 1.0f, -1.0f, 1.0f, 1.0f}, {true, true}}, + {{ 1.0f, 1.0f, 1.0f, -1.0f}, {true, true}}, + {{-1.0f, -1.0f, 1.0f, 1.0f}, {true, true}}, + {{-1.0f, 1.0f, -1.0f, 1.0f}, {true, true}}, + {{-1.0f, 1.0f, 1.0f, -1.0f}, {true, true}}, + {{ 1.0f, -1.0f, -1.0f, 1.0f}, {true, true}}, + {{ 1.0f, -1.0f, 1.0f, -1.0f}, {true, true}}, + {{ 1.0f, 1.0f, -1.0f, -1.0f}, {true, true}}, - {{-1.0f, -1.0f, -1.0f, 1.0f}, {FALSE, TRUE}}, - {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, - {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, - {{-1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, - {{ 1.0f, -1.0f, -1.0f, -1.0f}, {TRUE, FALSE}}, + {{-1.0f, -1.0f, -1.0f, 1.0f}, {false, true}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {true, true}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {true, true}}, + {{-1.0f, 1.0f, -1.0f, -1.0f}, {true, true}}, + {{ 1.0f, -1.0f, -1.0f, -1.0f}, {true, false}}, - {{-1.0f, -1.0f, -1.0f, -1.0f}, {FALSE, FALSE}}, + {{-1.0f, -1.0f, -1.0f, -1.0f}, {false, false}}, }; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -28871,10 +28871,10 @@ static void test_suballocate_small_textures(void) NULL, &IID_ID3D12Resource, (void **)&textures[i]); ok(hr == S_OK, "Failed to create placed resource %u, hr %#x.\n", i, hr); - check_interface(textures[i], &IID_ID3D12Object, TRUE); - check_interface(textures[i], &IID_ID3D12DeviceChild, TRUE); - check_interface(textures[i], &IID_ID3D12Pageable, TRUE); - check_interface(textures[i], &IID_ID3D12Resource, TRUE); + check_interface(textures[i], &IID_ID3D12Object, true); + check_interface(textures[i], &IID_ID3D12DeviceChild, true); + check_interface(textures[i], &IID_ID3D12Pageable, true); + check_interface(textures[i], &IID_ID3D12Resource, true); gpu_address = ID3D12Resource_GetGPUVirtualAddress(textures[i]); ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); -- 2.21.0

2 1

[PATCH vkd3d 4/6] tests: Introduce VKD3D_TEST_FILTER.
by Józef Kucia 18 Jul '19

18 Jul '19

From: Józef Kucia <jkucia(a)codeweavers.com> Useful for running a subset of tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- README | 4 ++++ include/private/vkd3d_test.h | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/README b/README index 2f2f3952c197..3c70ede80b24 100644 --- a/README +++ b/README @@ -65,6 +65,10 @@ commas or semicolons. * VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1 or 2. + * VKD3D_TEST_FILTER - a filter string. Only the tests whose names matches the + filter string will be run, e.g. VKD3D_TEST_FILTER=clear_render_target. + Useful for debugging or developing new tests. + * VKD3D_TEST_PLATFORM - can be set to "wine", "windows" or "other". The test platform controls the behavior of todo(), todo_if(), bug_if() and broken() conditions in tests. diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index a37f6ff70ce4..319bf5dc87ea 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -118,6 +118,7 @@ static struct bool bug_do_loop; bool bug_enabled; + const char *test_name_filter; char context[1024]; } vkd3d_test_state; @@ -254,6 +255,7 @@ vkd3d_test_debug(const char *fmt, ...) int main(int argc, char **argv) { + const char *test_filter = getenv("VKD3D_TEST_FILTER"); const char *debug_level = getenv("VKD3D_TEST_DEBUG"); char *test_platform = getenv("VKD3D_TEST_PLATFORM"); const char *bug = getenv("VKD3D_TEST_BUG"); @@ -261,6 +263,7 @@ int main(int argc, char **argv) memset(&vkd3d_test_state, 0, sizeof(vkd3d_test_state)); vkd3d_test_state.debug_level = debug_level ? atoi(debug_level) : 0; vkd3d_test_state.bug_enabled = bug ? atoi(bug) : true; + vkd3d_test_state.test_name_filter = test_filter; if (test_platform) { @@ -341,6 +344,9 @@ typedef void (*vkd3d_test_pfn)(void); static inline void vkd3d_run_test(const char *name, vkd3d_test_pfn test_pfn) { + if (vkd3d_test_state.test_name_filter && !strstr(name, vkd3d_test_state.test_name_filter)) + return; + vkd3d_test_debug("%s", name); test_pfn(); } -- 2.21.0

2 1

[PATCH 0/2] Help Linux perf get debug information from PE files
by Rémi Bernon 18 Jul '19

18 Jul '19

Sending these patches here as well as it could be useful for anyone wanting to make performance analysis, although it's a little bit hacky. Rémi Bernon (2): makefiles: Align PE sections so that they get directly mmap-ed makefiles: Split PE debug sections to separate ELF file tools/makedep.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.20.1

1 2

[PATCH] user32: Modal dialogs send WM_CANCELMODE when mouse is captured by unrelated window in same thread.
by Sergio 18 Jul '19

18 Jul '19

Signed-off-by: Sergio <sdelreal(a)codeweavers.com> --- dlls/user32/dialog.c | 3 + dlls/user32/tests/msg.c | 221 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 222 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 88c2930c06..36a442d32b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -701,7 +701,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { + HWND hwnd_capture; ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ + if ( (hwnd_capture = GetCapture()) && !IsChild( hwnd, hwnd_capture ) && modal_owner ) + SendMessageW(hwnd_capture, WM_CANCELMODE, 0, 0); } return hwnd; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..2508bb85d2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1675,6 +1675,85 @@ static const struct message WmModalDialogSeq_2[] = { { WM_NCDESTROY, sent }, { 0 } }; +/* remove capture when creating modal dialog */ +static const struct message WmDialogWithCaptureSeq[] = { + { WM_CANCELMODE, sent }, + { WM_CAPTURECHANGED, sent|defwinproc|lparam, 0 }, + { WM_KILLFOCUS, sent }, + { WM_ENABLE, sent|wparam, 0 }, + { HCBT_CREATEWND, hook }, + { WM_SETFONT, sent|optional }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_ENABLE, sent|wparam, 1 }, + { WM_SHOWWINDOW, sent|wparam, 1 }, + { HCBT_ACTIVATE, hook }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { HCBT_DESTROYWND, hook }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_DESTROY, sent }, + { 0 } +}; +static const struct message WmDialogWithCapture2Seq[] = { + { HCBT_CREATEWND, hook|optional }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_SHOWWINDOW, sent, 1 }, + { HCBT_ACTIVATE, hook }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATE, sent|optional }, + { WM_KILLFOCUS, sent|optional }, + { WM_CANCELMODE, sent }, + { WM_CAPTURECHANGED, sent|defwinproc, 0 }, + { HCBT_DESTROYWND, hook|optional }, + { WM_ACTIVATE, sent|optional }, + { WM_ACTIVATE, sent|optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { WM_DESTROY, sent }, + { 0 } +}; +static const struct message WmDialogNoCaptureSeq[] = { + { WM_CANCELMODE, sent }, + { WM_KILLFOCUS, sent|optional }, + { WM_ENABLE, sent }, + { HCBT_CREATEWND, hook|optional }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_ENABLE, sent }, + { WM_SHOWWINDOW, sent }, + { HCBT_ACTIVATE, hook|optional }, + { WM_ACTIVATE, sent|optional }, + { WM_ACTIVATE, sent|optional }, + { HCBT_DESTROYWND, hook|optional }, + { WM_ACTIVATE, sent|optional }, + { WM_ACTIVATE, sent|optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { WM_DESTROY, sent }, + { 0 } +}; +/* modeless dialogs don't remove capture */ +static const struct message WmDialogModelessWithCaptureSeq[] = { + { HCBT_CREATEWND, hook|optional }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_SHOWWINDOW, sent|wparam, 1 }, + { HCBT_ACTIVATE, hook|optional }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_KILLFOCUS, sent }, + { 0 } +}; + /* SetMenu for NonVisible windows with size change*/ static const struct message WmSetMenuNonVisibleSizeChangeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -4447,6 +4526,47 @@ static INT_PTR CALLBACK TestModalDlgProc2(HWND hwnd, UINT message, WPARAM wParam return 0; } +static INT_PTR CALLBACK TestModalDlgWithCaptureProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + switch (message) + { + case WM_NCHITTEST: + return HTCLIENT; + case WM_QUERYNEWPALETTE: + case WM_GETTEXT: + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + case WM_NCPAINT: + case WM_NCACTIVATE: + case WM_NCCALCSIZE: + case WM_NCDESTROY: + case WM_PAINT: + case WM_ERASEBKGND: + case WM_ACTIVATEAPP: + case WM_CTLCOLORDLG: + case WM_CTLCOLORBTN: + case WM_SETFOCUS: + case WM_KILLFOCUS: + case 0x90: + break; + case WM_SHOWWINDOW: + EndDialog(hwnd, 5); + default: + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "dialog"; + add_message(&msg); + } + return FALSE; +} + static void test_hv_scroll_1(HWND hwnd, INT ctl, DWORD clear, DWORD set, INT min, INT max) { DWORD style, exstyle; @@ -9771,6 +9891,45 @@ static LRESULT WINAPI HotkeyMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam return ret; } +static LRESULT WINAPI WindowCaptureProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct recvd_message msg; + + if (ignore_message(message)) return 0; + + switch (message) + { + case WM_NCHITTEST: + return HTCLIENT; + case WM_QUERYNEWPALETTE: + case WM_GETTEXT: + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + case WM_NCPAINT: + case WM_NCACTIVATE: + case WM_ERASEBKGND: + case WM_ACTIVATEAPP: + break; + default: + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "capture_window"; + add_message(&msg); + } + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + static BOOL RegisterWindowClasses(void) { WNDCLASSA cls; @@ -9820,6 +9979,10 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "NoCloseWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = WindowCaptureProcA; + cls.lpszClassName = "WindowCaptureClass"; + if(!RegisterClassA(&cls)) return FALSE; + ok(GetClassInfoA(0, "#32770", &cls), "GetClassInfo failed\n"); cls.style = 0; cls.hInstance = GetModuleHandleA(0); @@ -13664,6 +13827,7 @@ static void test_dialog_messages(void) WNDCLASSA cls; HWND hdlg, hedit1, hedit2, hfocus, parent, child, child2; LRESULT ret; + int dialog_ret; #define set_selection(hctl, start, end) \ ret = SendMessageA(hctl, EM_SETSEL, start, end); \ @@ -13820,11 +13984,64 @@ static void test_dialog_messages(void) flush_sequence(); DialogBoxA( 0, "TEST_DIALOG", child2, TestModalDlgProc2 ); ok_sequence(WmModalDialogSeq_2, "ModalDialog2", TRUE); - DestroyWindow(child2); DestroyWindow(child); DestroyWindow(parent); - flush_sequence(); + + /* test that if a window has the mouse captured, modal dialogs should send it WM_CANCELMODE */ + parent = CreateWindowExA(0, "WindowCaptureClass", "Test parent", WS_VISIBLE, + 100, 100, 200, 200, NULL, 0, 0, NULL); + ok(parent != NULL, "Failed creating window.\n"); + child = CreateWindowExA(0, "WindowCaptureClass", "Test child", WS_VISIBLE | WS_CHILD, + 100, 100, 200, 200, parent, 0, 0, NULL); + ok(child != NULL, "Failed creating window.\n"); + + /* test modal dialog being child of window with capture */ + SetCapture(parent); + ok(GetCapture() == parent, "Failed capturing mouse.\n"); + flush_sequence(); + dialog_ret = DialogBoxParamA(0, "TEST_DIALOG", parent, TestModalDlgWithCaptureProc, 0); + ok(dialog_ret > 0, "DialogBoxParamA failed.\n"); + ok_sequence(WmDialogWithCaptureSeq, "ModalDialogWithCapture", FALSE); + ok(GetCapture() == NULL, "Mouse shouldn't be captured by hwnd %p\n", GetCapture()); + + /* test modal dialog unrelated to window with capture */ + SetCapture(parent); + ok(GetCapture() == parent, "Failed capturing mouse.\n"); + flush_sequence(); + dialog_ret = DialogBoxParamA(0, "TEST_DIALOG", NULL, TestModalDlgWithCaptureProc, 0); + ok(dialog_ret > 0, "DialogBoxParamA failed.\n"); + ok_sequence(WmDialogWithCapture2Seq, "ModalDialogWithCapture2", FALSE); + ok(GetCapture() == NULL, "Mouse shouldn't be captured by hwnd %p\n", GetCapture()); + + /* test modal dialog unrelated to window with capture, child */ + SetCapture(child); + ok(GetCapture() == child, "Failed capturing mouse.\n"); + flush_sequence(); + dialog_ret = DialogBoxParamA(0, "TEST_DIALOG", NULL, TestModalDlgWithCaptureProc, 0); + ok(dialog_ret > 0, "DialogBoxParamA failed.\n"); + ok_sequence(WmDialogWithCapture2Seq, "ModalDialogWithCapture3", FALSE); + ok(GetCapture() == NULL, "Mouse shouldn't be captured by hwnd %p\n", GetCapture()); + + /* test modal dialog, no capture */ + flush_sequence(); + dialog_ret = DialogBoxParamA(0, "TEST_DIALOG", parent, TestModalDlgWithCaptureProc, 0); + ok(dialog_ret > 0, "DialogBoxParamA failed.\n"); + ok_sequence(WmDialogNoCaptureSeq, "ModalDialogNoCapture", FALSE); + ok(GetCapture() == NULL, "Mouse shouldn't be captured by hwnd %p\n", GetCapture()); + + /* test that modeless dialogs don't send message */ + SetCapture(parent); + ok(GetCapture() == parent, "Failed capturing mouse.\n"); + flush_sequence(); + hdlg = CreateDialogParamA(0, "TEST_DIALOG", 0, TestModalDlgWithCaptureProc, 0); + ok(hdlg != NULL, "CreateDialogParamA failed.\n"); + ok_sequence(WmDialogModelessWithCaptureSeq, "ModelessDialogWithCapture", FALSE); + ok(GetCapture() == parent, "Mouse should be captured by hwnd %p\n", parent); + + DestroyWindow(child); + DestroyWindow(parent); + DestroyWindow(hdlg); } static void test_enddialog_seq(HWND dialog, HWND owner) -- 2.17.1

3 2

[PATCH vkd3d] tests: Add tests for sample_b instruction.
by Jactry Zeng 17 Jul '19

17 Jul '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- tests/d3d12.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index bd055fb..72951c9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31335,6 +31335,315 @@ static void test_conditional_rendering(void) destroy_test_context(&context); } +static void test_sample_b(void) +{ + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + D3D12_STATIC_SAMPLER_DESC sampler_desc; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + unsigned int x_step, y_step; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + ID3D12Device *device; + unsigned int i, x, y; + float constant; + static const DWORD ps_sample_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float bias; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.SampleBias(s, p, bias); + } +#endif + 0x43425844, 0xc39b0686, 0x8244a7fc, 0x14c0b97a, 0x2900b3b7, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b4, 0x00000040, + 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, + 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c00004a, + 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; + static const unsigned int r8g8b8a8_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const uint8_t a8_data[] = + { + 0x00, 0xff, 0x7f, 0xf0, + 0x0f, 0x11, 0x00, 0x00, + 0xff, 0xf0, 0x0f, 0xff, + 0xfa, 0xfe, 0xaa, 0xcc, + }; + static const unsigned int a8_expected_data[] = + { + 0x00000000, 0xff000000, 0x7f000000, 0xf0000000, + 0x0f000000, 0x11000000, 0x00000000, 0x00000000, + 0xff000000, 0xf0000000, 0x0f000000, 0xff000000, + 0xfa000000, 0xfe000000, 0xaa000000, 0xcc000000, + }; + static const unsigned int rgba_level_0[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const unsigned int rgba_level_1[] = + { + 0xffffffff, 0xff0000ff, + 0xff000000, 0xff00ff00, + }; + static const unsigned int rgba_level_2[] = + { + 0xffff0000, + }; + static const unsigned int level_1_colors[] = + { + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + }; + static const unsigned int level_2_colors[] = + { + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + 0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000, + }; + static const struct + { + unsigned int width; + unsigned int height; + unsigned int miplevel_count; + unsigned int array_size; + float lod_bias; + float min_lod; + float max_lod; + float ps_constant; + DXGI_FORMAT format; + D3D12_SUBRESOURCE_DATA data[3]; + const unsigned int *expected_data; + } + tests[] = + { + { + 4, 4, 1, 1, 0.0f, 0.0f, D3D12_FLOAT32_MAX, 0.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {r8g8b8a8_data, 4 * sizeof(*r8g8b8a8_data), 16 * sizeof(*r8g8b8a8_data)}, + }, + r8g8b8a8_data, + }, + { + 4, 4, 1, 1, 0.0f, 0.0f, D3D12_FLOAT32_MAX, 0.0f, DXGI_FORMAT_A8_UNORM, + { + {a8_data, 4 * sizeof(*a8_data), 16 * sizeof(*a8_data)}, + }, + a8_expected_data, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, D3D12_FLOAT32_MAX, 0.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + rgba_level_0, + }, + { + 4, 4, 3, 1, 8.0f, 0.0f, D3D12_FLOAT32_MAX, 0.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + level_1_colors, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, D3D12_FLOAT32_MAX, 8.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + level_1_colors, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, D3D12_FLOAT32_MAX, 8.4f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + level_1_colors, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, D3D12_FLOAT32_MAX, 8.5f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + level_2_colors, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, D3D12_FLOAT32_MAX, 9.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + level_2_colors, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, 2.0f, 1.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + rgba_level_0, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, 2.0f, 9.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + level_2_colors, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, 1.0f, 9.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + level_1_colors, + }, + { + 4, 4, 3, 1, 0.0f, 0.0f, 0.0f, 9.0f, DXGI_FORMAT_R8G8B8A8_UNORM, + { + {rgba_level_0, 4 * sizeof(*rgba_level_0), 0}, + {rgba_level_1, 2 * sizeof(*rgba_level_1), 0}, + {rgba_level_2, sizeof(*rgba_level_2), 0}, + }, + rgba_level_0, + }, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 640.0f; + desc.rt_height = 480.0f; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + vkd3d_test_set_context("Test %u", i); + + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.MipLODBias = tests[i].lod_bias; + sampler_desc.MinLOD = tests[i].min_lod; + sampler_desc.MaxLOD = tests[i].max_lod; + context.root_signature = create_texture_root_signature_(__LINE__, context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 1, 0, &sampler_desc); + context.pipeline_state = create_pipeline_state(device, context.root_signature, + context.render_target_desc.Format, NULL, &ps_sample, NULL); + + texture = create_default_texture2d(device, tests[i].width, tests[i].height, tests[i].array_size, + tests[i].miplevel_count, tests[i].format, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_texture_data(texture, tests[i].data, tests[i].miplevel_count * tests[i].array_size, + queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + ID3D12Device_CreateShaderResourceView(device, texture, NULL, cpu_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, red, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + constant = tests[i].ps_constant; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &constant, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + x_step = desc.rt_width / tests[i].width; + y_step = desc.rt_height / tests[i].height; + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + for (y = 0; y < tests[i].height; ++y) + { + for (x = 0; x < tests[i].width; ++x) + { + unsigned int color = get_readback_uint(&rb, x * x_step + x_step / 2, y * y_step + y_step / 2, 0); + ok(compare_color(color, tests[i].expected_data[tests[i].width * y + x], 0), + "Got color 0x%08x, expected 0x%08x at (%u, %u).\n", + color, tests[i].expected_data[tests[i].width * y + x], x, y); + } + } + release_resource_readback(&rb); + + ID3D12Resource_Release(texture); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + ID3D12RootSignature_Release(context.root_signature); + context.root_signature = NULL; + } + vkd3d_test_set_context(NULL); + + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -31496,4 +31805,5 @@ START_TEST(d3d12) run_test(test_graphics_compute_queue_synchronization); run_test(test_early_depth_stencil_tests); run_test(test_conditional_rendering); + run_test(test_sample_b); } -- 2.20.1

1 0

[PATCH] wldap32: Use correct integer type when calling ber_printf() or ber_scanf().
by Conor McCarthy 17 Jul '19

17 Jul '19

GCC compiles ber_tag_t and ber_len_t as 64-bit types on 64-bit machines, but in Win64 they are 32-bit. As va_list arguments they pass unchecked and unconverted. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/wldap32/ber.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index c2c6f269..d8fd502d 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -353,7 +353,7 @@ INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) } case 't': { - unsigned int tag = va_arg( list, unsigned int ); + ber_tag_t tag = va_arg( list, ULONG ); ret = ber_printf( berelement, new_fmt, tag ); break; } @@ -372,7 +372,7 @@ INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) case 'X': { char *str = va_arg( list, char * ); - int len = va_arg( list, int ); + ber_len_t len = va_arg( list, ULONG ); new_fmt[0] = 'B'; /* 'X' is deprecated */ ret = ber_printf( berelement, new_fmt, str, len ); break; @@ -447,8 +447,10 @@ INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) } case 't': { - unsigned int *tag = va_arg( list, unsigned int * ); - ret = ber_scanf( berelement, new_fmt, tag ); + ULONG *tag = va_arg( list, ULONG * ); + ber_tag_t ber_tag; + ret = ber_scanf( berelement, new_fmt, &ber_tag ); + *tag = ber_tag; break; } case 'v': @@ -460,8 +462,10 @@ INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) case 'B': { char **str = va_arg( list, char ** ); - int *len = va_arg( list, int * ); - ret = ber_scanf( berelement, new_fmt, str, len ); + ULONG *len = va_arg( list, ULONG * ); + ber_len_t ber_len; + ret = ber_scanf( berelement, new_fmt, str, &ber_len ); + *len = ber_len; break; } case 'O': -- 2.22.0

2 1

[PATCH] wldap32: Use ldap_memvfree() to free array allocated by libldap.
by Conor McCarthy 16 Jul '19

16 Jul '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/wldap32/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 62ffdbab..e83e6d23 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -258,7 +258,7 @@ ULONG CDECL ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result, ldap_memfree( matchedU ); ldap_memfree( errorU ); - strarrayfreeU( referralsU ); + ldap_memvfree( (void **)referralsU ); ldap_controls_free( serverctrlsU ); #endif -- 2.22.0

1 0

[PATCH 3/3] winex11.drv: Indicate whether the drop point is outside of the client area.
by Akihiro Sagawa 16 Jul '19

16 Jul '19

For instance, the menu bar is outside of the client area, so fNC is TRUE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winex11.drv/xdnd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] shell32: Fix return value for DragQueryPoint.
by Akihiro Sagawa 16 Jul '19

16 Jul '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47514 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shell32/shellole.c | 2 +- dlls/shell32/tests/shellole.c | 2 +- dlls/winemac.drv/dragdrop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 1/3] shell32/tests: Add DragQueryPoint tests.
by Akihiro Sagawa 16 Jul '19

16 Jul '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shell32/tests/shellole.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0