- Wine-Devel - list.winehq.org

[PATCH 6/9] gdi32: Use get_dc_attr in GetGraphicsMode.
by Jacek Caban July 28, 2021

July 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 16 ---------------- dlls/gdi32/gdidc.c | 9 +++++++++ 2 files changed, 9 insertions(+), 16 deletions(-)

2 1

[PATCH 5/9] gdi32: Move background color to DC_ATTR.
by Jacek Caban July 28, 2021

July 28, 2021

2 1

[PATCH 4/9] gdi32: Move layout to DC_ATTR.
by Jacek Caban July 28, 2021

July 28, 2021

2 1

[PATCH 3/9] gdi32: Use get_dc_attr in SetROP2.
by Jacek Caban July 28, 2021

July 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 28 ---------------------------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 23 +++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 31 insertions(+), 36 deletions(-)

2 1

[PATCH 2/9] gdi32: Move ROP mode to DC_ATTR.
by Jacek Caban July 28, 2021

July 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 25 ++++--------------------- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 6 files changed, 18 insertions(+), 26 deletions(-)

2 1

[PATCH 1/9] gdi32: Move disabled flag to DC_ATTR.
by Jacek Caban July 28, 2021

July 28, 2021

And honour it in get_dc_attr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Patches 2-7 are resent as they depend on this one. dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/gdidc.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 4 files changed, 5 insertions(+), 5 deletions(-)

2 1

[PATCH vkd3d v4 1/6] vkd3d-shader: Include register ranges in descriptor binding error messages.
by Conor McCarthy July 28, 2021

July 28, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0407f501..23d1fcc7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2236,6 +2236,8 @@ struct vkd3d_dxbc_compiler struct vkd3d_shader_spec_constant *spec_constants; size_t spec_constants_size; enum vkd3d_shader_compile_option_formatting_flags formatting; + + struct vkd3d_string_buffer_cache string_buffers; }; static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) @@ -2358,6 +2360,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->scan_descriptor_info = scan_descriptor_info; + vkd3d_string_buffer_cache_init(&compiler->string_buffers); + vkd3d_dxbc_compiler_emit_initial_declarations(compiler); return compiler; @@ -2484,6 +2488,22 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_ compiler->failed = true; } +static struct vkd3d_string_buffer *vkd3d_shader_register_range_string(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register_range *range) +{ + struct vkd3d_string_buffer *buffer = vkd3d_string_buffer_get(&compiler->string_buffers); + + if (!buffer) + return NULL; + + if (range->last != ~0u) + vkd3d_string_buffer_printf(buffer, "[%u:%u]", range->first, range->last); + else + vkd3d_string_buffer_printf(buffer, "[%u:*]", range->first); + + return buffer; +} + static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, @@ -2576,11 +2596,14 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor } if (shader_interface->binding_count) { - FIXME("Could not find binding for type %#x, space %u, register %u, shader type %#x.\n", - descriptor_type, range->space, range->first, compiler->shader_type); + struct vkd3d_string_buffer *buffer = vkd3d_shader_register_range_string(compiler, range); + const char *range_str = buffer ? buffer->buffer : ""; + FIXME("Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.\n", + descriptor_type, range->space, range_str, compiler->shader_type); vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND, - "Could not find descriptor binding for type %#x, space %u, register %u, shader type %#x.", - descriptor_type, range->space, range->first, compiler->shader_type); + "Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.", + descriptor_type, range->space, range_str, compiler->shader_type); + vkd3d_string_buffer_release(&compiler->string_buffers, buffer); } } @@ -9611,5 +9634,7 @@ void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) vkd3d_free(compiler->shader_phases); vkd3d_free(compiler->spec_constants); + vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers); + vkd3d_free(compiler); } -- 2.32.0

3 10

[PATCH vkd3d 1/6] vkd3d: Pass vkd3d_pipeline_bind_point values to update_descriptors() calls.
by Chip Davis July 28, 2021

July 28, 2021

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 93c519a..bc502c0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2933,7 +2933,7 @@ static bool d3d12_command_list_update_compute_state(struct d3d12_command_list *l if (!d3d12_command_list_update_compute_pipeline(list)) return false; - d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); + d3d12_command_list_update_descriptors(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE); return true; } @@ -2950,7 +2950,7 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list if (!d3d12_command_list_update_current_framebuffer(list)) return false; - d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS); + d3d12_command_list_update_descriptors(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS); if (list->current_render_pass != VK_NULL_HANDLE) return true; -- 2.31.1

2 11

[PATCH vkd3d 1/5] vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature_header().
by Zebediah Figura July 28, 2021

July 28, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 48 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5bd91d68..08eb50f3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2963,43 +2963,23 @@ static size_t get_chunk_offset(struct root_signature_writer_context *context) return bytecode_get_size(&context->buffer) - context->chunk_position; } -static int shader_write_root_signature_header(struct root_signature_writer_context *context) +static void shader_write_root_signature_header(struct root_signature_writer_context *context) { struct vkd3d_bytecode_buffer *buffer = &context->buffer; + unsigned int i; - if (!write_dword(context, TAG_DXBC)) - goto fail; + put_u32(buffer, TAG_DXBC); /* The checksum is computed when all data is generated. */ - if (!write_dwords(context, 4, 0x00000000)) - goto fail; - - if (!write_dword(context, 0x00000001)) - goto fail; - - context->total_size_position = bytecode_get_size(buffer); - if (!write_dword(context, 0xffffffff)) /* total size */ - goto fail; - - if (!write_dword(context, 1)) /* chunk count */ - goto fail; - - /* chunk offset */ - if (!write_dword(context, bytecode_get_size(buffer) + sizeof(uint32_t))) - goto fail; - - if (!write_dword(context, TAG_RTS0)) - goto fail; - if (!write_dword(context, 0xffffffff)) /* chunk size */ - goto fail; + for (i = 0; i < 4; ++i) + put_u32(buffer, 0); + put_u32(buffer, 1); + context->total_size_position = put_u32(buffer, 0xffffffff); + put_u32(buffer, 1); /* chunk count */ + put_u32(buffer, bytecode_get_size(buffer) + sizeof(uint32_t)); /* chunk offset */ + put_u32(buffer, TAG_RTS0); + put_u32(buffer, 0xffffffff); context->chunk_position = bytecode_get_size(buffer); - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature header."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, @@ -3426,11 +3406,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro goto done; memset(dxbc, 0, sizeof(*dxbc)); - if ((ret = shader_write_root_signature_header(&context)) < 0) - { - vkd3d_free(context.buffer.data); - goto done; - } + shader_write_root_signature_header(&context); if ((ret = shader_write_root_signature(&context, root_signature)) < 0) { -- 2.32.0

2 9

[PATCH vkd3d v2] vkd3d-shader: Implement DMOV instruction.
by Conor McCarthy July 28, 2021

July 28, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++++ libs/vkd3d-shader/spirv.c | 10 +++++++--- libs/vkd3d-shader/trace.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 7 +++++++ tests/d3d12.c | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e57cc413..0b6b5eea 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -311,6 +311,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DEQ = 0xc3, + VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, @@ -1250,6 +1251,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, + {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", @@ -1804,6 +1806,8 @@ static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * } dst_param->write_mask = (token & VKD3D_SM4_WRITEMASK_MASK) >> VKD3D_SM4_WRITEMASK_SHIFT; + if (data_type == VKD3D_DATA_DOUBLE) + dst_param->write_mask = vkd3d_write_mask_64_from_32(dst_param->write_mask); /* Scalar registers are declared with no write mask in shader bytecode. */ if (!dst_param->write_mask && shader_sm4_is_scalar_register(&dst_param->reg)) dst_param->write_mask = VKD3DSP_WRITEMASK_0; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0407f501..6d8b23b7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3573,6 +3573,7 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; enum vkd3d_shader_component_type component_type; struct vkd3d_shader_register_info reg_info; + unsigned int src_write_mask = write_mask; uint32_t type_id; assert(reg->type != VKD3DSPR_IMMCONST); @@ -3584,14 +3585,16 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi component_type = vkd3d_component_type_from_data_type(reg->data_type); if (component_type != reg_info.component_type) { - unsigned int component_count = vkd3d_write_mask_component_count(write_mask); - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); + if (reg->data_type == VKD3D_DATA_DOUBLE) + src_write_mask = vkd3d_write_mask_32_from_64(write_mask); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, + vkd3d_write_mask_component_count(src_write_mask)); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); component_type = reg_info.component_type; } vkd3d_dxbc_compiler_emit_store(compiler, - reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, write_mask, val_id); + reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, src_write_mask, val_id); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, @@ -9309,6 +9312,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_HS_JOIN_PHASE: vkd3d_dxbc_compiler_enter_shader_phase(compiler, instruction); break; + case VKD3DSIH_DMOV: case VKD3DSIH_MOV: vkd3d_dxbc_compiler_emit_mov(compiler, instruction); break; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 556654ec..b80aef67 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFI */ "defi", /* VKD3DSIH_DEQ */ "deq", /* VKD3DSIH_DIV */ "div", + /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DP2 */ "dp2", /* VKD3DSIH_DP2ADD */ "dp2add", /* VKD3DSIH_DP3 */ "dp3", @@ -1122,6 +1123,9 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, { static const char write_mask_chars[] = "xyzw"; + if (param->reg.data_type == VKD3D_DATA_DOUBLE) + write_mask = vkd3d_write_mask_32_from_64(write_mask); + shader_addline(buffer, ".%s", compiler->colours.write_mask); if (write_mask & VKD3DSP_WRITEMASK_0) shader_addline(buffer, "%c", write_mask_chars[0]); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b247acc0..e8741790 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -193,6 +193,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFI, VKD3DSIH_DEQ, VKD3DSIH_DIV, + VKD3DSIH_DMOV, VKD3DSIH_DP2, VKD3DSIH_DP2ADD, VKD3DSIH_DP3, @@ -1034,6 +1035,12 @@ static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int co return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } +static inline unsigned int vkd3d_write_mask_64_from_32(DWORD write_mask32) +{ + unsigned int write_mask64 = write_mask32 | (write_mask32 >> 1); + return (write_mask64 & VKD3DSP_WRITEMASK_0) | ((write_mask64 & VKD3DSP_WRITEMASK_2) >> 1); +} + static inline unsigned int vkd3d_write_mask_32_from_64(unsigned int write_mask64) { unsigned int write_mask32 = (write_mask64 | (write_mask64 << 1)) diff --git a/tests/d3d12.c b/tests/d3d12.c index fbf14a2a..b10f24be 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9878,7 +9878,7 @@ static void test_shader_instructions(void) {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}}, {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, - {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true, true}, + {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true}, {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true, true}, {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true, true}, {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true}, -- 2.32.0

2 1