October 2021 - Wine-Devel - list.winehq.org

[PATCH vkd3d 07/10] vkd3d-shader/spirv: Implement support for descriptor array offsets.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Some tweaks to the API documentation. This supersedes patch 216993. include/vkd3d_shader.h | 72 +++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/spirv.c | 12 ++++++- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 37b5936d..3ba84a52 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -64,6 +64,11 @@ enum vkd3d_shader_structure_type * \since 1.3 */ VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO, + /** + * The structure is a vkd3d_shader_descriptor_offset_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -208,8 +213,9 @@ struct vkd3d_shader_descriptor_binding /** The binding index of the descriptor. */ unsigned int binding; /** - * The size of this descriptor array. Descriptor arrays are not supported in - * this version of vkd3d-shader, and therefore this value must be 1. + * The size of this descriptor array. If an offset is specified for this + * binding by the vkd3d_shader_descriptor_offset_info structure, counting + * starts at that offset. */ unsigned int count; }; @@ -452,6 +458,68 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/** + * A chained structure containing descriptor offsets. + * + * This structure is optional. + * + * This structure extends vkd3d_shader_interface_info. + * + * This structure contains only input parameters. + * + * \since 1.3 + */ +struct vkd3d_shader_descriptor_offset_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Pointer to an array of offsets into the descriptor arrays referenced by + * the 'bindings' array in struct vkd3d_shader_interface_info. This allows + * mapping multiple shader resource arrays to a single binding point in + * the target environment. + * + * For example, to map Direct3D constant buffer registers 'cb0[0:3]' and + * 'cb1[6:7]' to descriptors 8-12 and 4-5 in the Vulkan descriptor array in + * descriptor set 3 and with binding 2, set the following values in the + * 'bindings' array in struct vkd3d_shader_interface_info: + * + * \code + * type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV + * register_space = 0 + * register_index = 0 + * binding.set = 3 + * binding.binding = 2 + * binding.count = 4 + * + * type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV + * register_space = 0 + * register_index = 6 + * binding.set = 3 + * binding.binding = 2 + * binding.count = 2 + * \endcode + * + * and then pass \c {8, \c 4} as \a binding_offsets here. + * + * This field may be NULL, in which case the corresponding offsets are + * specified to be 0. + */ + const unsigned int *binding_offsets; + + /** + * Pointer to an array of offsets into the descriptor arrays referenced by + * the 'uav_counters' array in struct vkd3d_shader_interface_info. This + * works the same way as \ref binding_offsets above. UAV counter arrays are + * not supported in this version of vkd3d-shader, and therefore this field + * must either be NULL or specify 0 offsets. + */ + const unsigned int *uav_counter_offsets; +}; + /** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f9124fc4..6cf438d9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2231,6 +2231,7 @@ struct vkd3d_dxbc_compiler size_t control_flow_info_size; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; @@ -2292,6 +2293,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; const struct vkd3d_shader_interface_info *shader_interface; + const struct vkd3d_shader_descriptor_offset_info *offset_info; const struct vkd3d_shader_spirv_target_info *target_info; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; @@ -2385,6 +2387,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader for (i = 0; i < shader_interface->push_constant_buffer_count; ++i) compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } + + if ((offset_info = vkd3d_find_struct(shader_interface->next, DESCRIPTOR_OFFSET_INFO))) + { + compiler->offset_info = *offset_info; + if (offset_info->uav_counter_offsets) + WARN("Ignoring UAV counter offsets %p.\n", offset_info->uav_counter_offsets); + } } compiler->scan_descriptor_info = scan_descriptor_info; @@ -2546,6 +2555,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int register_last = (range->last == ~0u) ? range->first : range->last; + const unsigned int *binding_offsets = compiler->offset_info.binding_offsets; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2626,7 +2636,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor || current->binding.count <= register_last - current->register_index) continue; - *binding_base_idx = current->register_index; + *binding_base_idx = current->register_index - (binding_offsets ? binding_offsets[i] : 0); return current->binding; } if (shader_interface->binding_count) -- 2.20.1

1 0

[PATCH vkd3d 06/10] vkd3d-shader/spirv: Implement texel offset support for sample_c instructions.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase of patch 215486. libs/vkd3d-shader/spirv.c | 13 +++++++++---- tests/d3d12.c | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 58bf3d9c..f9124fc4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8235,12 +8235,9 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[1]; + uint32_t image_operands[2]; SpvOp op; - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - if (instruction->handler_idx == VKD3DSIH_SAMPLE_C_LZ) { op = SpvOpImageSampleDrefExplicitLod; @@ -8255,6 +8252,14 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_SAMPLED | VKD3D_IMAGE_FLAG_DEPTH); + + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); diff --git a/tests/d3d12.c b/tests/d3d12.c index 93cd56db..c73e15bc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14784,8 +14784,7 @@ static void test_sample_c_lz(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo_if(j && tests[i].d_ref > 0.0f) - check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, -- 2.20.1

1 0

[PATCH vkd3d 05/10] tests: Add tests for sample_c texel offsets.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Minor style changes. This supersedes patch 215485. tests/d3d12.c | 110 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 30 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 08334765..93cd56db 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14502,11 +14502,11 @@ static void test_gather_c(void) static void test_sample_c_lz(void) { + struct depth_stencil_resource ds, ds_offset; D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D12GraphicsCommandList *command_list; D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; - struct depth_stencil_resource ds; struct test_context_desc desc; struct resource_readback rb; struct test_context context; @@ -14514,7 +14514,7 @@ static void test_sample_c_lz(void) ID3D12CommandQueue *queue; struct vec4 ps_constant; ID3D12Device *device; - unsigned int i; + unsigned int i, j; RECT rect; static const D3D12_STATIC_SAMPLER_DESC sampler_desc = @@ -14557,6 +14557,36 @@ static void test_sample_c_lz(void) 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_array = {ps_array_code, sizeof(ps_array_code)}; + static const DWORD ps_array_offset_code[] = + { +#if 0 + Texture2DArray t; + SamplerComparisonState s; + + float ref; + float layer; + + float4 main(float4 position : SV_Position) : SV_Target + { + return t.SampleCmpLevelZero(s, float3(position.x / 5120.0f, position.y / 3840.0f, layer), ref, + int2(4, 4)); + } +#endif + 0x43425844, 0xdf99ade1, 0x420d8d11, 0x3abe4b31, 0x116badd9, 0x00000001, 0x0000018c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f0, 0x00000050, + 0x0000003c, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300085a, 0x00106000, + 0x00000000, 0x04004058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, + 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x394ccccd, 0x39888889, 0x00000000, 0x00000000, + 0x06000036, 0x00100042, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x8f000047, 0x80008801, + 0x80000202, 0x00155543, 0x00100012, 0x00000000, 0x00100246, 0x00000000, 0x00107006, 0x00000000, + 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_array_offset = {ps_array_offset_code, sizeof(ps_array_offset_code)}; static const DWORD ps_cube_code[] = { #if 0 @@ -14657,6 +14687,11 @@ static void test_sample_c_lz(void) {4, 1.0f, 1.0f}, {5, 1.0f, 1.0f}, }; + static const D3D12_SHADER_BYTECODE * const shaders_2d_array[] = + { + &ps_array, + &ps_array_offset, + }; memset(&desc, 0, sizeof(desc)); desc.rt_width = 640; @@ -14675,15 +14710,15 @@ static void test_sample_c_lz(void) heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); - /* 2D array texture */ - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, context.render_target_desc.Format, NULL, &ps_array, NULL); - init_depth_stencil(&ds, device, 32, 32, ARRAY_SIZE(depth_values), 2, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); + init_depth_stencil(&ds_offset, device, 32, 32, ARRAY_SIZE(depth_values), 2, + DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); for (i = 0; i < ARRAY_SIZE(depth_values); ++i) { + static const D3D12_RECT rects[] = {{0, 0, 3, 3}, {3, 3, 32, 32}}; + memset(&dsv_desc, 0, sizeof(dsv_desc)); dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2DARRAY; @@ -14692,6 +14727,11 @@ static void test_sample_c_lz(void) ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL); + ID3D12Device_CreateDepthStencilView(device, ds_offset.texture, &dsv_desc, ds_offset.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds_offset.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 1, &rects[0]); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds_offset.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 1, &rects[1]); dsv_desc.Texture2DArray.MipSlice = 1; ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); @@ -14699,6 +14739,7 @@ static void test_sample_c_lz(void) D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); } + /* 2D array texture */ memset(&srv_desc, 0, sizeof(srv_desc)); srv_desc.Format = DXGI_FORMAT_R32_FLOAT; srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; @@ -14708,44 +14749,52 @@ static void test_sample_c_lz(void) srv_desc.Texture2DArray.FirstArraySlice = 0; srv_desc.Texture2DArray.ArraySize = ARRAY_SIZE(depth_values); ID3D12Device_CreateShaderResourceView(context.device, ds.texture, &srv_desc, cpu_handle); + ID3D12Device_CreateShaderResourceView(context.device, ds_offset.texture, &srv_desc, + get_cpu_descriptor_handle(&context, heap, 1)); transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); memset(&ps_constant, 0, sizeof(ps_constant)); - for (i = 0; i < ARRAY_SIZE(tests); ++i) + for (j = 0; j < ARRAY_SIZE(shaders_2d_array); ++j) { - vkd3d_test_set_context("test %u", i); + context.pipeline_state = create_pipeline_state(context.device, context.root_signature, + context.render_target_desc.Format, NULL, shaders_2d_array[j], NULL); - ps_constant.x = tests[i].d_ref; - ps_constant.y = tests[i].layer; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + vkd3d_test_set_context("test %u%s", i, j ? " offset" : ""); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 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, - get_gpu_descriptor_handle(&context, heap, 0)); - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ps_constant.x = tests[i].d_ref; + ps_constant.y = tests[i].layer; - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 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, get_gpu_descriptor_handle(&context, heap, j)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - 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); + todo_if(j && tests[i].d_ref > 0.0f) + check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + + 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); } vkd3d_test_set_context(NULL); - ID3D12PipelineState_Release(context.pipeline_state); - /* cube texture */ context.pipeline_state = create_pipeline_state(context.device, context.root_signature, context.render_target_desc.Format, NULL, &ps_cube, NULL); @@ -14793,6 +14842,7 @@ static void test_sample_c_lz(void) } vkd3d_test_set_context(NULL); + destroy_depth_stencil(&ds_offset); destroy_depth_stencil(&ds); ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); -- 2.20.1

1 0

[PATCH vkd3d 04/10] vkd3d: Reject 0 sample count textures in d3d12_resource_validate_desc().
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Buffers with 0 sample counts were already rejected here. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Minor style changes. This supersedes patch 214667. libs/vkd3d/resource.c | 6 ++++++ tests/d3d12.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d6e5d4be..705e720f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1681,6 +1681,12 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d /* Fall through. */ case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + if (!desc->SampleDesc.Count) + { + WARN("Invalid sample count 0.\n"); + return E_INVALIDARG; + } + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid format %#x.\n", desc->Format); diff --git a/tests/d3d12.c b/tests/d3d12.c index 4a7309d6..08334765 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1703,9 +1703,7 @@ static void test_create_committed_resource(void) resource_desc.SampleDesc.Count = 0; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12Resource_Release(resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); resource_desc.SampleDesc.Count = 1; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, -- 2.20.1

1 0

[PATCH vkd3d 03/10] tests: Add a test for 0 sample count resources to test_create_committed_resource().
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Windows returns E_INVALIDARG at least on AMD and Intel. Psychonauts 2 attempts to create resources with this argument. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Minor style changes. This supersedes patch 214666. tests/d3d12.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e6461e31..4a7309d6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1700,6 +1700,14 @@ static void test_create_committed_resource(void) ID3D12Resource_Release(resource); resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + resource_desc.SampleDesc.Count = 1; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &clear_value, &IID_ID3D12Resource, (void **)&resource); -- 2.20.1

1 0

[PATCH vkd3d 02/10] tests: Add tests for d3d12_command_list_IASetVertexBuffers() calls with NULL views.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Part of a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Slightly modified the comment. This supersedes patch 214665. tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4e908d43..e6461e31 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19201,6 +19201,10 @@ static void test_null_vbv(void) vbv[1].SizeInBytes = 0; ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + /* Calls with NULL "views" pointers should be ignored. */ + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, NULL); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 1, 1, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); transition_resource_state(command_list, context.render_target, -- 2.20.1

1 0

[PATCH vkd3d 01/10] vkd3d: Ignore d3d12_command_list_IASetVertexBuffers() calls with NULL views.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Part of a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Print a WARN. This supersedes patch 214664. libs/vkd3d/command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 118fc4bb..1db624e0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4498,6 +4498,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } + if (!views) + { + WARN("NULL \"views\" pointer specified.\n"); + return; + } + for (i = 0; i < view_count; ++i) { if (views[i].BufferLocation) -- 2.20.1

1 0

[PATCH v2 1/2] server: Return STATUS_IMAGE_INVALID_NOT_MZ on create_mapping for a fake 16 bit dll.
by Oleh Nykyforchyn Oct. 14, 2021

Oct. 14, 2021

If request ( create_mapping ) returns STATUS_IMAGE_INVALID_WIN_16 for a file, then the search fails, but STATUS_IMAGE_INVALID_NOT_MZ triggers attempt to load *.so file instead in ntdll. It allows to run 16 bin applications again. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51564 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- server/mapping.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 93dae94b7c4..af9e92fcf25 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -697,6 +697,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mz_size = size; pos = mz.dos.e_lfanew; + mapping->image.image_flags = 0; + mapping->image.loader_flags = 0; + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; + else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; + size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ @@ -707,7 +714,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s { IMAGE_OS2_HEADER *os2 = (IMAGE_OS2_HEADER *)&nt; if (os2->ne_magic != IMAGE_OS2_SIGNATURE) return STATUS_INVALID_IMAGE_PROTECT; - if (os2->ne_exetyp == 2) return STATUS_INVALID_IMAGE_WIN_16; + if (os2->ne_exetyp == 2) + { + if (mapping->image.image_flags & IMAGE_FLAGS_WineFakeDll) + return STATUS_INVALID_IMAGE_NOT_MZ; + else + return STATUS_INVALID_IMAGE_WIN_16; + } if (os2->ne_exetyp == 5) return STATUS_INVALID_IMAGE_PROTECT; return STATUS_INVALID_IMAGE_NE_FORMAT; } @@ -737,7 +750,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr32.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -769,7 +781,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr64.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -788,10 +799,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.zerobits = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; - else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ -- 2.33.0

1 1

[PATCH 1/2] server: Return a fake mapping with WineFakeDll flag set for a fake 16 bit dll.
by Oleh Nykyforchyn Oct. 14, 2021

Oct. 14, 2021

If fake 16 bit dll is found by create_mapping and status is set to STATUS_IMAGE_INVALID_WIN_16, do not release the mapping, but return it with WineFakeDll flag set to allow ntdll properly discover this dll by NtCreateSection and handle by find_dll_file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51564 Signed-off-by: Oleh Nykyforchyn <oleh.nyk(a)gmail.com> --- server/mapping.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 93dae94b7c4..8016feaf432 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -697,6 +697,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mz_size = size; pos = mz.dos.e_lfanew; + mapping->image.image_flags = 0; + mapping->image.loader_flags = 0; + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; + else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; + size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ @@ -707,7 +714,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s { IMAGE_OS2_HEADER *os2 = (IMAGE_OS2_HEADER *)&nt; if (os2->ne_magic != IMAGE_OS2_SIGNATURE) return STATUS_INVALID_IMAGE_PROTECT; - if (os2->ne_exetyp == 2) return STATUS_INVALID_IMAGE_WIN_16; + if (os2->ne_exetyp == 2) + { + mapping->image.machine = IMAGE_FILE_MACHINE_I386; + return STATUS_INVALID_IMAGE_WIN_16; + } if (os2->ne_exetyp == 5) return STATUS_INVALID_IMAGE_PROTECT; return STATUS_INVALID_IMAGE_NE_FORMAT; } @@ -737,7 +748,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr32.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -769,7 +779,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s nt.opt.hdr64.SectionAlignment & page_mask); mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; - mapping->image.image_flags = 0; if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && @@ -788,10 +797,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.zerobits = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; - else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ @@ -920,7 +925,11 @@ static struct mapping *create_mapping( struct object *root, const struct unicode unsigned int err = get_image_params( mapping, st.st_size, unix_fd ); if (!err) return mapping; set_error( err ); - goto error; + /* return fake mapping to discover fake 16 bit dll */ + if ((err == STATUS_INVALID_IMAGE_WIN_16) && (mapping->image.image_flags & IMAGE_FLAGS_WineFakeDll)) + return mapping; + else + goto error; } if (!mapping->size) { @@ -1106,6 +1115,12 @@ struct object *create_user_data_mapping( struct object *root, const struct unico if (!(mapping = create_mapping( root, name, attr, sizeof(KSHARED_USER_DATA), SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, sd ))) return NULL; + /* FIXME: is this necessary? */ + if ((get_error() == STATUS_INVALID_IMAGE_WIN_16) && (mapping->image.image_flags & IMAGE_FLAGS_WineFakeDll)) + { + release_object( mapping ); + return NULL; + } ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); if (ptr != MAP_FAILED) { -- 2.33.0

2 2

[PATCH] vbscript: Emit catch after next in for each loops.
by Robert Wilhelm Oct. 14, 2021

Oct. 14, 2021

Hi Jacek, We crash in following testcase: On Error Resume Next For each i in empty Next There is no catch after next but we search for it until we hit unaccessible memory. Please see bugreport for details. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39463 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/tests/error.vbs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index da56eac74b2..8eb1878ec05 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -829,6 +829,10 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t return hres; label_set_addr(ctx, loop_ctx.for_end_label); + + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + return S_OK; } diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 1853f6c4bf5..9b74dc8773e 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -309,12 +309,15 @@ call ok(x = "ok", "testOnErrorClear failed") sub testForEachError() on error resume next - dim x, y + dim x, y, z y = false + z = false for each x in empty y = true next + z = true call ok(y, "for each not executed") + call ok(z, "line after next not executed") call todo_wine_ok(Err.Number = VB_E_OBJNOTCOLLECTION, "Err.Number = " & Err.Number) end sub -- 2.31.1

2 1