April 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Recognize SM5 hs_control_point_phase opcode.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 231f9188bf61eb2fe59fdf68ec95ea452d0426ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=231f9188bf61eb2fe59fdf68e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:34 2016 +0200 wined3d: Recognize SM5 hs_control_point_phase 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 | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d310121..fd96a59 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5282,6 +5282,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ NULL, + /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_IADD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d24a117..775352d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8200,6 +8200,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GE */ shader_glsl_relop, + /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_IADD */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index aadfa23..ecae88b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -106,6 +106,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GE */ "ge", + /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", /* WINED3DSIH_HS_FORK_PHASE */ "hs_fork_phase", /* WINED3DSIH_IADD */ "iadd", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 239648d..4c2e094 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -191,6 +191,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM5_OP_HS_DECLS = 0x71, + WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, @@ -703,6 +704,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, + {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bebbc0a..0b9b95d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -592,6 +592,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOI, WINED3DSIH_FTOU, WINED3DSIH_GE, + WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS, WINED3DSIH_HS_FORK_PHASE, WINED3DSIH_IADD,

1 0

Józef Kucia : wined3d: Recognize SM5 vOutputControlPointID register.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 63d03924915474ff086e470aa4854f7c6763c5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d03924915474ff086e470aa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:32 2016 +0200 wined3d: Recognize SM5 vOutputControlPointID 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 | 33 +++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 920abd7..776ff48 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1686,6 +1686,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "u"); break; + case WINED3DSPR_OUTPOINTID: + shader_addline(buffer, "vOutputControlPointID"); + break; + case WINED3DSPR_FORKINSTID: shader_addline(buffer, "vForkInstanceId"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a949312..71ff1dc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -211,21 +211,22 @@ enum wined3d_sm4_opcode enum wined3d_sm4_register_type { - WINED3D_SM4_RT_TEMP = 0x0, - WINED3D_SM4_RT_INPUT = 0x1, - WINED3D_SM4_RT_OUTPUT = 0x2, - WINED3D_SM4_RT_IMMCONST = 0x4, - WINED3D_SM4_RT_SAMPLER = 0x6, - WINED3D_SM4_RT_RESOURCE = 0x7, - WINED3D_SM4_RT_CONSTBUFFER = 0x8, - WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, - WINED3D_SM4_RT_PRIMID = 0xb, - WINED3D_SM4_RT_DEPTHOUT = 0xc, - WINED3D_SM4_RT_NULL = 0xd, - WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, - WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, - WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, - WINED3D_SM5_RT_UAV = 0x1e, + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_SAMPLER = 0x6, + WINED3D_SM4_RT_RESOURCE = 0x7, + WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, + WINED3D_SM4_RT_PRIMID = 0xb, + WINED3D_SM4_RT_DEPTHOUT = 0xc, + WINED3D_SM4_RT_NULL = 0xd, + WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, + WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, + WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, + WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, + WINED3D_SM5_RT_UAV = 0x1e, }; enum wined3d_sm4_output_primitive_type @@ -752,7 +753,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID */ WINED3DSPR_OUTPOINTID, /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8bbc86..a897db0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -368,6 +368,7 @@ enum wined3d_shader_register_type WINED3DSPR_NULL, WINED3DSPR_RESOURCE, WINED3DSPR_UAV, + WINED3DSPR_OUTPOINTID, WINED3DSPR_FORKINSTID, WINED3DSPR_INCONTROLPOINT, WINED3DSPR_TESSCOORD,

1 0

Józef Kucia : wined3d: Print "state_id" for undefined states.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: a5b810b0b3489e845eb3ab0ed951ed075444df0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b810b0b3489e845eb3ab0ed… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:29 2016 +0200 wined3d: Print "state_id" for undefined states. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 937df15..cacb401 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -42,7 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_shader); static void state_undefined(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - ERR("Undefined state.\n"); + ERR("Undefined state %s (%#x).\n", debug_d3dstate(state_id), state_id); } void state_nop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Józef Kucia : wined3d: Recognize SM5 vpc register.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 90ce5e24f7895380ebaa2f7fea4684b519d70b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ce5e24f7895380ebaa2f7fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:33 2016 +0200 wined3d: Recognize SM5 vpc 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 776ff48..aadfa23 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1698,6 +1698,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vicp"); break; + case WINED3DSPR_PATCHCONST: + shader_addline(buffer, "vpc"); + break; + case WINED3DSPR_TESSCOORD: shader_addline(buffer, "vDomainLocation"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 71ff1dc..239648d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -225,6 +225,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, + WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, }; @@ -758,7 +759,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_PATCH_CONSTANT_DATA */ WINED3DSPR_PATCHCONST, /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a897db0..bebbc0a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -371,6 +371,7 @@ enum wined3d_shader_register_type WINED3DSPR_OUTPOINTID, WINED3DSPR_FORKINSTID, WINED3DSPR_INCONTROLPOINT, + WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, };

1 0

Józef Kucia : wined3d: Recognize SM5 vicp register.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: a6c0139e9d4cf0c279a312984b7ce54fe55b2b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c0139e9d4cf0c279a312984… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:31 2016 +0200 wined3d: Recognize SM5 vicp 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 | 91 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 644ebef..920abd7 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1690,6 +1690,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vForkInstanceId"); break; + case WINED3DSPR_INCONTROLPOINT: + shader_addline(buffer, "vicp"); + break; + case WINED3DSPR_TESSCOORD: shader_addline(buffer, "vDomainLocation"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4c8558d..a949312 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -211,20 +211,21 @@ enum wined3d_sm4_opcode enum wined3d_sm4_register_type { - WINED3D_SM4_RT_TEMP = 0x0, - WINED3D_SM4_RT_INPUT = 0x1, - WINED3D_SM4_RT_OUTPUT = 0x2, - WINED3D_SM4_RT_IMMCONST = 0x4, - WINED3D_SM4_RT_SAMPLER = 0x6, - WINED3D_SM4_RT_RESOURCE = 0x7, - WINED3D_SM4_RT_CONSTBUFFER = 0x8, - WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, - WINED3D_SM4_RT_PRIMID = 0xb, - WINED3D_SM4_RT_DEPTHOUT = 0xc, - WINED3D_SM4_RT_NULL = 0xd, - WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, - WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, - WINED3D_SM5_RT_UAV = 0x1e, + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_SAMPLER = 0x6, + WINED3D_SM4_RT_RESOURCE = 0x7, + WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, + WINED3D_SM4_RT_PRIMID = 0xb, + WINED3D_SM4_RT_DEPTHOUT = 0xc, + WINED3D_SM4_RT_NULL = 0xd, + WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, + WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, + WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, + WINED3D_SM5_RT_UAV = 0x1e, }; enum wined3d_sm4_output_primitive_type @@ -729,37 +730,37 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = static const enum wined3d_shader_register_type register_type_table[] = { - /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, - /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, - /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ ~0u, - /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, - /* UNKNOWN */ ~0u, - /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, - /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, - /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, - /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER, - /* UNKNOWN */ ~0u, - /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, - /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, - /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, - /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, - /* UNKNOWN */ ~0u, - /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, + /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, + /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, + /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER, + /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, + /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, + /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, + /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, + /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 142b950..a8bbc86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -369,6 +369,7 @@ enum wined3d_shader_register_type WINED3DSPR_RESOURCE, WINED3DSPR_UAV, WINED3DSPR_FORKINSTID, + WINED3DSPR_INCONTROLPOINT, WINED3DSPR_TESSCOORD, };

1 0

Józef Kucia : wined3d: Recognize SM5 vDomainLocation register.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: ddc7ea39adb2ed44df0a85e44c75dde5b8e51f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc7ea39adb2ed44df0a85e44… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:30 2016 +0200 wined3d: Recognize SM5 vDomainLocation 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 ca54818..644ebef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1690,6 +1690,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vForkInstanceId"); break; + case WINED3DSPR_TESSCOORD: + shader_addline(buffer, "vDomainLocation"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ae17a1f..4c8558d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -223,6 +223,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_NULL = 0xd, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, + WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, }; @@ -756,7 +757,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26ef25b..142b950 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -369,6 +369,7 @@ enum wined3d_shader_register_type WINED3DSPR_RESOURCE, WINED3DSPR_UAV, WINED3DSPR_FORKINSTID, + WINED3DSPR_TESSCOORD, }; enum wined3d_data_type

1 0

Hans Leidekker : bcrypt: Add support for BCRYPT_RNG_ALGORITHM.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 6415947e09fd4ac9cc7e80f82a0e95cf24126423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6415947e09fd4ac9cc7e80f82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 4 11:07:05 2016 +0200 bcrypt: Add support for BCRYPT_RNG_ALGORITHM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 86 +++++++++++++++++++++++++++------------------- dlls/bcrypt/tests/bcrypt.c | 29 ++++++++++++++++ include/bcrypt.h | 1 + 3 files changed, 80 insertions(+), 36 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 43d4688..6023c94 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -136,42 +136,6 @@ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULONG count, ULONG flags) -{ - const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG; - TRACE("%p, %p, %u, %08x - semi-stub\n", algorithm, buffer, count, flags); - - if (!algorithm) - { - /* It's valid to call without an algorithm if BCRYPT_USE_SYSTEM_PREFERRED_RNG - * is set. In this case the preferred system RNG is used. - */ - if (!(flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG)) - return STATUS_INVALID_HANDLE; - } - if (!buffer) - return STATUS_INVALID_PARAMETER; - - if (flags & ~supported_flags) - FIXME("unsupported flags %08x\n", flags & ~supported_flags); - - if (algorithm) - FIXME("ignoring selected algorithm\n"); - - /* When zero bytes are requested the function returns success too. */ - if (!count) - return STATUS_SUCCESS; - - if (flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG) - { - if (RtlGenRandom(buffer, count)) - return STATUS_SUCCESS; - } - - FIXME("called with unsupported parameters, returning error\n"); - return STATUS_NOT_IMPLEMENTED; -} - #define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') #define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') struct object @@ -182,6 +146,7 @@ struct object enum alg_id { ALG_ID_MD5, + ALG_ID_RNG, ALG_ID_SHA1, ALG_ID_SHA256, ALG_ID_SHA384, @@ -193,6 +158,7 @@ static const struct { const WCHAR *alg_name; } alg_props[] = { /* ALG_ID_MD5 */ { 16, BCRYPT_MD5_ALGORITHM }, + /* ALG_ID_RNG */ { 0, BCRYPT_RNG_ALGORITHM }, /* ALG_ID_SHA1 */ { 20, BCRYPT_SHA1_ALGORITHM }, /* ALG_ID_SHA256 */ { 32, BCRYPT_SHA256_ALGORITHM }, /* ALG_ID_SHA384 */ { 48, BCRYPT_SHA384_ALGORITHM }, @@ -206,6 +172,47 @@ struct algorithm BOOL hmac; }; +NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG count, ULONG flags) +{ + const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG; + struct algorithm *algorithm = handle; + + TRACE("%p, %p, %u, %08x - semi-stub\n", handle, buffer, count, flags); + + if (!algorithm) + { + /* It's valid to call without an algorithm if BCRYPT_USE_SYSTEM_PREFERRED_RNG + * is set. In this case the preferred system RNG is used. + */ + if (!(flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG)) + return STATUS_INVALID_HANDLE; + } + else if (algorithm->hdr.magic != MAGIC_ALG || algorithm->id != ALG_ID_RNG) + return STATUS_INVALID_HANDLE; + + if (!buffer) + return STATUS_INVALID_PARAMETER; + + if (flags & ~supported_flags) + FIXME("unsupported flags %08x\n", flags & ~supported_flags); + + if (algorithm) + FIXME("ignoring selected algorithm\n"); + + /* When zero bytes are requested the function returns success too. */ + if (!count) + return STATUS_SUCCESS; + + if (algorithm || (flags & BCRYPT_USE_SYSTEM_PREFERRED_RNG)) + { + if (RtlGenRandom(buffer, count)) + return STATUS_SUCCESS; + } + + FIXME("called with unsupported parameters, returning error\n"); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) { struct algorithm *alg; @@ -224,6 +231,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; + else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512; @@ -628,6 +636,12 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, } FIXME( "unsupported md5 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_RNG: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) return STATUS_NOT_SUPPORTED; + FIXME( "unsupported rng algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + case ALG_ID_SHA1: if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e2318c4..9bd2cea 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -694,6 +694,34 @@ static void test_BcryptHash(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_rng(void) +{ + BCRYPT_ALG_HANDLE alg; + ULONG size, len; + UCHAR buf[16]; + NTSTATUS ret; + + alg = NULL; + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RNG_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + + test_alg_name(alg, "RNG"); + + memset(buf, 0, 16); + ret = BCryptGenRandom(alg, buf, 8, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(memcmp(buf, buf + 8, 8), "got zeroes\n"); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + + START_TEST(bcrypt) { HMODULE module; @@ -707,6 +735,7 @@ START_TEST(bcrypt) test_sha384(); test_sha512(); test_md5(); + test_rng(); pBCryptHash = (void *)GetProcAddress( module, "BCryptHash" ); diff --git a/include/bcrypt.h b/include/bcrypt.h index 93f4326..c521bcc 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -64,6 +64,7 @@ typedef LONG NTSTATUS; {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} +#define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0}

1 0

Alexandre Julliard : winebuild: Mark the stack non-executable in static import libraries.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: c52e4b65514b5722e40875dad88d8db80bae0229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52e4b65514b5722e40875dad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 15:41:51 2016 +0900 winebuild: Mark the stack non-executable in static import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 4fbcab0..e7bad72 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1454,6 +1454,7 @@ static void build_unix_import_lib( DLLSPEC *spec ) output( "\t%s %s%s$%u$%s\n", get_asm_ptr_keyword(), asm_name( prefix ), dll_name, odp->ordinal, name ); output_function_size( name ); + output_gnu_stack_note(); break; default:

1 0

Alexandre Julliard : makefiles: Use the msvcrt build flags also for cross tests.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: a1cc2b185dda238732a321052e91b91ec7e9de01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cc2b185dda238732a321052… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 22:16:29 2016 +0900 makefiles: Use the msvcrt build flags also for cross tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 334740e..6d0c0fc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2639,6 +2639,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); + if (make->use_msvcrt) output_filenames( msvcrt_flags ); output_filename( "-DWINE_CROSSTEST" ); output_filenames( cpp_flags ); output_filename( "$(CFLAGS)" );

1 0

Hugh McMaster : reg: Clean-up and inform the user if RegDeleteValueW fails when deleting all values in a registry key.
by Alexandre Julliard April 4, 2016

April 4, 2016

1 0