June 2016 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Recognize vThreadID register.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 12754d0f255b3514a0b9f5b67b628fa936edd536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12754d0f255b3514a0b9f5b67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:29 2016 +0200 wined3d: Recognize vThreadID register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7682850..b79416f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1752,6 +1752,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_THREADID: + shader_addline(buffer, "vThreadID"); + break; + case WINED3DSPR_THREADGROUPID: shader_addline(buffer, "vThreadGroupID"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6e224f6..447861c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -252,6 +252,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, + WINED3D_SM5_RT_THREAD_ID = 0x20, WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, @@ -833,7 +834,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_THREAD_ID */ WINED3DSPR_THREADID, /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 78cbe24..40eb8e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,6 +388,7 @@ enum wined3d_shader_register_type WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, + WINED3DSPR_THREADID, WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX,

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tgsm_raw opcode.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 6778ceca2c52d67c066b8b01d9270c681664810b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6778ceca2c52d67c066b8b01d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:30 2016 +0200 wined3d: Recognize SM5 dcl_tgsm_raw opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 8 ++++++++ 5 files changed, 28 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 00cc495..f81e8ea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5250,6 +5250,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bb2beb4..921904f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8588,6 +8588,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b79416f..1859c0f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -80,6 +80,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", + /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -2272,6 +2273,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_tessellator_partitioning(&buffer, ins.declaration.tessellator_partitioning); } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.tgsm_raw.reg, &shader_version); + shader_addline(&buffer, ", %u", ins.declaration.tgsm_raw.byte_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 447861c..959b10c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -221,6 +221,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, + WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -628,6 +629,14 @@ static void shader_sm5_read_dcl_thread_group(struct wined3d_shader_instruction * ins->declaration.thread_group_size.z = *tokens++; } +static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); + ins->declaration.tgsm_raw.byte_count = *tokens; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -788,6 +797,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", shader_sm4_read_dcl_resource}, + {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", + shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 40eb8e0..45207df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -594,6 +594,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, + WINED3DSIH_DCL_TGSM_RAW, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, @@ -913,6 +914,12 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_tgsm_raw +{ + struct wined3d_shader_dst_param reg; + unsigned int byte_count; +}; + struct wined3d_shader_thread_group_size { unsigned int x, y, z; @@ -945,6 +952,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + struct wined3d_shader_tgsm_raw tgsm_raw; struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive;

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tgsm_structured opcode.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: e2384387e0f56c175916083df8577527bc2d97c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2384387e0f56c175916083df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:31 2016 +0200 wined3d: Recognize SM5 dcl_tgsm_structured opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f81e8ea..2e070fb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5251,6 +5251,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 921904f..b4ddf89 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8589,6 +8589,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1859c0f..4a3f53d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -2279,6 +2280,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_dump_dst_param(&buffer, &ins.declaration.tgsm_raw.reg, &shader_version); shader_addline(&buffer, ", %u", ins.declaration.tgsm_raw.byte_count); } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.tgsm_structured.reg, &shader_version); + shader_addline(&buffer, ", %u, %u", ins.declaration.tgsm_structured.byte_stride, + ins.declaration.tgsm_structured.structure_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 959b10c..8961dc5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -222,6 +222,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, + WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -637,6 +638,15 @@ static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, ins->declaration.tgsm_raw.byte_count = *tokens; } +static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); + ins->declaration.tgsm_structured.byte_stride = *tokens++; + ins->declaration.tgsm_structured.structure_count = *tokens; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -799,6 +809,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", shader_sm5_read_dcl_tgsm_raw}, + {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", + shader_sm5_read_dcl_tgsm_structured}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45207df..701e93e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -595,6 +595,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, WINED3DSIH_DCL_TGSM_RAW, + WINED3DSIH_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, @@ -920,6 +921,13 @@ struct wined3d_shader_tgsm_raw unsigned int byte_count; }; +struct wined3d_shader_tgsm_structured +{ + struct wined3d_shader_dst_param reg; + unsigned int byte_stride; + unsigned int structure_count; +}; + struct wined3d_shader_thread_group_size { unsigned int x, y, z; @@ -953,6 +961,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; struct wined3d_shader_tgsm_raw tgsm_raw; + struct wined3d_shader_tgsm_structured tgsm_structured; struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive;

1 0

Józef Kucia : wined3d: Introduce wined3d_gl_limits_get_uniform_block_range().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: f6bd191385431929f5a8847a8a3556e6309850df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bd191385431929f5a8847a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:32 2016 +0200 wined3d: Introduce wined3d_gl_limits_get_uniform_block_range(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 17 +++++++---------- dlls/wined3d/state.c | 14 +++++++++----- dlls/wined3d/utils.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 4 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b4ddf89..3aa9626 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7518,13 +7518,14 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, GLuint program_id, - const struct wined3d_shader_reg_maps *reg_maps, unsigned int base, unsigned int count) + const struct wined3d_shader_reg_maps *reg_maps) { + struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + unsigned int i, base, count; GLuint block_idx; - unsigned int i; - struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, reg_maps->shader_version.type, &base, &count); for (i = 0; i < count; ++i) { if (!reg_maps->cb_sizes[i]) @@ -7819,8 +7820,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->vs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &vshader->reg_maps, - 0, gl_info->limits.vertex_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &vshader->reg_maps); } else { @@ -7860,8 +7860,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (gshader) { entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &gshader->reg_maps, - gl_info->limits.vertex_uniform_blocks, gl_info->limits.geometry_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &gshader->reg_maps); } if (ps_id) @@ -7876,9 +7875,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->ps.ycorrection_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &pshader->reg_maps, - gl_info->limits.vertex_uniform_blocks + gl_info->limits.geometry_uniform_blocks, - gl_info->limits.fragment_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &pshader->reg_maps); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bc55263..6b9cd3d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4849,30 +4849,34 @@ static void state_cb(const struct wined3d_gl_info *gl_info, const struct wined3d static void state_cb_vs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, 0, limits->vertex_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, base, count); } static void state_cb_gs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, - limits->vertex_uniform_blocks, limits->geometry_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_GEOMETRY, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, base, count); } static void state_cb_ps(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, - limits->vertex_uniform_blocks + limits->geometry_uniform_blocks, limits->fragment_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, base, count); } static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9575b39..01e56eb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5748,3 +5748,30 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) return TRUE; } + +void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) +{ + *base = 0; + *count = gl_limits->vertex_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_VERTEX) + return; + + *base += *count; + *count = gl_limits->geometry_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY) + return; + + *base += *count; + *count = gl_limits->fragment_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_PIXEL) + return; + + *base += *count; + *count = 0; + + ERR("Unhandled shader type %#x.\n", shader_type); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 701e93e..ce094ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1971,9 +1971,9 @@ struct wined3d_gl_limits UINT lights; UINT textures; UINT texture_coords; - UINT vertex_uniform_blocks; - UINT geometry_uniform_blocks; - UINT fragment_uniform_blocks; + unsigned int vertex_uniform_blocks; + unsigned int geometry_uniform_blocks; + unsigned int fragment_uniform_blocks; UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers; @@ -2004,6 +2004,9 @@ struct wined3d_gl_limits UINT arb_ps_temps; }; +void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; + struct wined3d_gl_info { DWORD selected_gl_version;

1 0

Józef Kucia : wined3d: Use single function for STATE_CONSTANT_BUFFER.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: a0269a4ab154e8f11ba7ea47971603dfc10a7ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0269a4ab154e8f11ba7ea479… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:33 2016 +0200 wined3d: Use single function for STATE_CONSTANT_BUFFER. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 51 +++++++++++---------------------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6b9cd3d..b157389 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4832,53 +4832,24 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); } -static void state_cb(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, - enum wined3d_shader_type type, unsigned int base, unsigned int count) +static void state_cb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + enum wined3d_shader_type shader_type = state_id - STATE_CONSTANT_BUFFER(0); + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer; - unsigned int i; + unsigned int i, base, count; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) { - buffer = state->cb[type][i]; + buffer = state->cb[shader_type][i]; GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, buffer ? buffer->buffer_object : 0)); } checkGLcall("glBindBufferBase"); } -static void state_cb_vs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, base, count); -} - -static void state_cb_gs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_GEOMETRY, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, base, count); -} - -static void state_cb_ps(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, base, count); -} - static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -4896,11 +4867,11 @@ static void state_shader_resource_binding(struct wined3d_context *context, const struct StateEntryTemplate misc_state_template[] = { - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_vs, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_gs, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb_ps, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb_warn, }, WINED3D_GL_EXT_NONE }, { STATE_SHADER_RESOURCE_BINDING, { STATE_SHADER_RESOURCE_BINDING, state_shader_resource_binding}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRCBLEND), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE },

1 0

Józef Kucia : d3d11/tests: Use get_rtv_desc() in test_render_target_views().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 7e1fd3d3c9f2df922f2a567342ed40252b0603aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1fd3d3c9f2df922f2a56734… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:34 2016 +0200 d3d11/tests: Use get_rtv_desc() in test_render_target_views(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3c92855..8626b68 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5637,20 +5637,12 @@ static void test_render_target_views(void) UINT miplevel_count; UINT array_size; }; - struct rtv - { - DXGI_FORMAT format; - D3D11_RTV_DIMENSION dimension; - unsigned int miplevel_idx; - unsigned int layer_idx; - unsigned int layer_count; - }; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; static struct test { struct texture texture; - struct rtv rtv; + struct rtv_desc rtv; DWORD expected_colors[4]; } tests[] = @@ -5724,23 +5716,7 @@ static void test_render_target_views(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); - rtv_desc.Format = texture_desc.Format; - rtv_desc.ViewDimension = test->rtv.dimension; - if (test->rtv.dimension == D3D11_RTV_DIMENSION_TEXTURE2D) - { - U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; - } - else if (test->rtv.dimension == D3D11_RTV_DIMENSION_TEXTURE2DARRAY) - { - U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; - U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; - U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; - } - else - { - trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); - } - + get_rtv_desc(&rtv_desc, &test->rtv); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr);

1 0

Józef Kucia : d3d10core/tests: Use get_rtv_desc() in test_render_target_views().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: eab40edba5e457459270e14c0f8113d7457bc419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab40edba5e457459270e14c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:35 2016 +0200 d3d10core/tests: Use get_rtv_desc() in test_render_target_views(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index eabc659..1f70e22 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2166,7 +2166,7 @@ static void test_render_target_views(void) static struct test { struct texture texture; - struct rtv rtv; + struct rtv_desc rtv; DWORD expected_colors[4]; } tests[] = @@ -2238,23 +2238,7 @@ static void test_render_target_views(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); - rtv_desc.Format = texture_desc.Format; - rtv_desc.ViewDimension = test->rtv.dimension; - if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2D) - { - U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; - } - else if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2DARRAY) - { - U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; - U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; - U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; - } - else - { - trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); - } - + get_rtv_desc(&rtv_desc, &test->rtv); hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr);

1 0

Michael Stefaniuc : avifil32: Avoid using CopyRect().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: e8a2a68f5956d0ac2a2a65c0c4751681ca8d099e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a2a68f5956d0ac2a2a65c0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:51:48 2016 +0200 avifil32: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 3aa8637..45a4d98 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -655,7 +655,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, This->sInfo.dwRate = asi->dwRate; This->sInfo.dwScale = asi->dwScale; This->sInfo.dwQuality = asi->dwQuality; - CopyRect(&This->sInfo.rcFrame, &asi->rcFrame); + This->sInfo.rcFrame = asi->rcFrame; memcpy(This->sInfo.szName, asi->szName, sizeof(asi->szName)); This->sInfo.dwEditCount++;

1 0

Michael Stefaniuc : comdlg32: Avoid using CopyRect().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 4e7272f087f814007a3225a5e08d8d8d811be8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7272f087f814007a3225a5e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:52:30 2016 +0200 comdlg32: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 8b307ae..6bf54c3 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -247,7 +247,7 @@ static void CC_DrawFocusRect(CCPRIV *lpp, HWND hwnd, int x, int y, int rows, int /* draw it */ hdc = GetDC(hwnd); DrawFocusRect(hdc, &rect); - CopyRect(&lpp->focusRect, &rect); + lpp->focusRect = rect; lpp->hwndFocus = hwnd; ReleaseDC(hwnd, hdc); }

1 0

Michael Stefaniuc : user32/tests: Avoid using CopyRect().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: ce888709821b6f05705acbcef0b5e51e6bf78eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce888709821b6f05705acbcef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:53:03 2016 +0200 user32/tests: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c135fdf..8505983 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1078,7 +1078,7 @@ static void test_nonclient_area(HWND hwnd) if (IsRectEmpty(&rc_window) || IsRectEmpty(&rc_client) || rc_window.right > 32768 || rc_window.bottom > 32768) return; - CopyRect(&rc, &rc_client); + rc = rc_client; MapWindowPoints(hwnd, 0, (LPPOINT)&rc, 2); FixedAdjustWindowRectEx(&rc, style, menu, exstyle); @@ -1086,7 +1086,7 @@ static void test_nonclient_area(HWND hwnd) "window rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, win=%s, calc=%s\n", style, exstyle, menu, wine_dbgstr_rect(&rc_window), wine_dbgstr_rect(&rc)); - CopyRect(&rc, &rc_client); + rc = rc_client; MapWindowPoints(hwnd, 0, (LPPOINT)&rc, 2); wine_AdjustWindowRectEx(&rc, style, menu, exstyle); ok(EqualRect(&rc, &rc_window), @@ -1094,7 +1094,7 @@ static void test_nonclient_area(HWND hwnd) style, exstyle, menu, wine_dbgstr_rect(&rc_window), wine_dbgstr_rect(&rc)); - CopyRect(&rc, &rc_window); + rc = rc_window; DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -1111,11 +1111,11 @@ static void test_nonclient_area(HWND hwnd) /* and now test AdjustWindowRectEx and WM_NCCALCSIZE on synthetic data */ SetRect(&rc_client, 0, 0, 250, 150); - CopyRect(&rc_window, &rc_client); + rc_window = rc_client; MapWindowPoints(hwnd, 0, (LPPOINT)&rc_window, 2); FixedAdjustWindowRectEx(&rc_window, style, menu, exstyle); - CopyRect(&rc, &rc_window); + rc = rc_window; DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -5278,14 +5278,14 @@ static LRESULT WINAPI parentdc_window_procA(HWND hwnd, UINT msg, WPARAM wparam, { case WM_PAINT: GetClientRect(hwnd, &rc); - CopyRect(&t->client, &rc); + t->client = rc; GetWindowRect(hwnd, &rc); trace("WM_PAINT: hwnd %p, client rect %s, window rect %s\n", hwnd, wine_dbgstr_rect(&t->client), wine_dbgstr_rect(&rc)); BeginPaint(hwnd, &ps); - CopyRect(&t->paint, &ps.rcPaint); + t->paint = ps.rcPaint; GetClipBox(ps.hdc, &rc); - CopyRect(&t->clip, &rc); + t->clip = rc; trace("clip rect %s, paint rect %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&ps.rcPaint)); EndPaint(hwnd, &ps);

1 0