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

Frédéric Delanoy : French translation for release 1.9.7
by Jeremy Newman 04 Apr '16

04 Apr '16

Module: website Branch: master Commit: b2df0334dd53070d11e811e8a44d2205f50f33c8 URL: http://source.winehq.org/git/website.git/?a=commit;h=b2df0334dd53070d11e811… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 2 09:05:33 2016 +0200 French translation for release 1.9.7 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016040201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016040201.xml b/news/fr/2016040201.xml new file mode 100644 index 0000000..b40ca71 --- /dev/null +++ b/news/fr/2016040201.xml @@ -0,0 +1,16 @@ +<news> +<date>2 avril 2016</date> +<title>Sortie de Wine 1.9.7</title> +<body> +La version de développement 1.9.7 de Wine est disponible. +<a href="{$root}/announce/1.9.7">Nouveautés</a> de cette version : +<ul> + <li>Travail supplémentaire en vue du flux de commandes WineD3D.</li> + <li>Meilleure prise en charge des shaders Shader Model 5.</li> + <li>Gestion des exceptions C++ sous x86-64.</li> + <li>Prise en charge des bibliothèques d'import statiques de type Windows.</li> + <li>Correctifs de performances dans le rédacteur XML.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.7.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.7
by Jeremy Newman 04 Apr '16

04 Apr '16

Module: website Branch: master Commit: ea3002d934aa4d86d6e058698e8e16108cfd1d77 URL: http://source.winehq.org/git/website.git/?a=commit;h=ea3002d934aa4d86d6e058… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Apr 2 07:55:34 2016 +0200 Polish translation for release 1.9.7 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016040201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2016040201.xml b/news/pl/2016040201.xml new file mode 100644 index 0000000..753d302 --- /dev/null +++ b/news/pl/2016040201.xml @@ -0,0 +1,17 @@ +<news> +<date>Kwiecień 2, 2016</date> +<title>Wydano Wine 1.9.7</title> +<body> + Wydanie rozwojowe Wine 1.9.7 jest już dostępne. + <a href="{$root}/announce/1.9.7">Co nowego</a> w tym wydaniu: +<ul> + <li>Postęp w kierunku strumienia poleceń WineD3D.</li> + <li>Szersze wsparcie Modelu Cieniowania 5.</li> + <li>Obsługa wyjątków C++ na x86-64.</li> + <li>Wsparcie dla bibliotek importowanych statycznie w stylu Windowsa.</li> + <li>Poprawki do wydajności w programie zapisującym XML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.7.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Francois Gouget : testbot/TestAgent: Make a couple of Wait() variable names more explicit.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: tools Branch: master Commit: 629db98627c2514367ab111f68dfa8ea0c4a5dd2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=629db98627c2514367ab111f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 4 12:29:10 2016 +0200 testbot/TestAgent: Make a couple of Wait() variable names more explicit. These timeout and deadline are specific to this Wait() operation unlike the general TestAgent timeout and deadline fields. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 43481a9..7f1fc24 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1171,7 +1171,7 @@ sub Run($$$;$$$) =item C<Wait()> -Waits at most Timeout seconds for the specified remote process to terminate. +Waits at most WaitTimeout seconds for the specified remote process to terminate. The Keepalive specifies how often, in seconds, to check that the remote end is still alive and reachable. @@ -1180,21 +1180,21 @@ is still alive and reachable. sub Wait($$$;$) { - my ($self, $Pid, $Timeout, $Keepalive) = @_; - debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", ", ", + my ($self, $Pid, $WaitTimeout, $Keepalive) = @_; + debug("Wait $Pid, ", defined $WaitTimeout ? $WaitTimeout : "<undef>", ", ", defined $Keepalive ? $Keepalive : "<undef>", "\n"); my $Result; $Keepalive ||= 0xffffffff; my $OldTimeout = $self->{timeout}; - my $Deadline = $Timeout ? time() + $Timeout : undef; + my $WaitDeadline = $WaitTimeout ? time() + $WaitTimeout : undef; while (1) { my $Remaining = $Keepalive; - if ($Deadline) + if ($WaitDeadline) { - $Remaining = $Deadline - time(); + $Remaining = $WaitDeadline - time(); last if ($Remaining < 0); $Remaining = $Keepalive if ($Keepalive < $Remaining); }

1 0

Francois Gouget : testbot/TestAgent: Trace the SendFile() and Run() flags and redirection options.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: tools Branch: master Commit: 23eee2e2db7744f7a70df9e7dbb5c5dcb08fc085 URL: http://source.winehq.org/git/tools.git/?a=commit;h=23eee2e2db7744f7a70df9e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 4 12:29:21 2016 +0200 testbot/TestAgent: Trace the SendFile() and Run() flags and redirection options. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7f1fc24..55a1431 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1079,7 +1079,7 @@ sub _SendStringOrFile($$$$$$) sub SendFile($$$;$) { my ($self, $LocalPathName, $ServerPathName, $Flags) = @_; - debug("SendFile $LocalPathName -> $self->{agenthost} $ServerPathName\n"); + debug("SendFile '$LocalPathName' -> $self->{agenthost} '$ServerPathName' Flags=", $Flags || 0, "\n"); if (open(my $fh, "<", $LocalPathName)) { @@ -1095,7 +1095,7 @@ sub SendFile($$$;$) sub SendFileFromString($$$;$) { my ($self, $Data, $ServerPathName, $Flags) = @_; - debug("SendFile String -> $self->{agenthost} $ServerPathName\n"); + debug("SendFile String -> $self->{agenthost} '$ServerPathName' Flags=", $Flags || 0, "\n"); return $self->_SendStringOrFile($Data, undef, undef, $ServerPathName, $Flags); } @@ -1115,7 +1115,7 @@ sub _GetStringOrFile($$$) sub GetFile($$$) { my ($self, $ServerPathName, $LocalPathName) = @_; - debug("GetFile $self->{agenthost} $ServerPathName -> $LocalPathName\n"); + debug("GetFile $self->{agenthost} '$ServerPathName' -> '$LocalPathName'\n"); if (open(my $fh, ">", $LocalPathName)) { @@ -1131,7 +1131,7 @@ sub GetFile($$$) sub GetFileToString($$) { my ($self, $ServerPathName) = @_; - debug("GetFile $self->{agenthost} $ServerPathName -> String\n"); + debug("GetFile $self->{agenthost} '$ServerPathName' -> String\n"); return $self->_GetStringOrFile($ServerPathName, undef, undef); } @@ -1145,6 +1145,12 @@ sub Run($$$;$$$) { my ($self, $Argv, $Flags, $ServerInPath, $ServerOutPath, $ServerErrPath) = @_; debug("Run $self->{agenthost} '", join("' '", @$Argv), "'\n"); + if ($Flags or $ServerInPath or $ServerOutPath or $ServerErrPath) + { + debug(" Flags=", $Flags || 0, " In='", $ServerInPath || "", + "' Out='", $ServerOutPath || "", "' Err='", $ServerErrPath || "", + "'\n"); + } if (!$self->_StartRPC($RPC_RUN) or !$self->_SendListSize('ArgC', 4 + @$Argv) or

1 0

Alexandre Julliard : Wine release 1.9.7
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: website Branch: master Commit: 4aa09de8834c7766ae2c3ebad0614403761176b4 URL: http://source.winehq.org/git/website.git/?a=commit;h=4aa09de8834c7766ae2c3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 2 00:04:40 2016 +0900 Wine release 1.9.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016040201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016040201.xml b/news/en/2016040201.xml new file mode 100644 index 0000000..7cda21b --- /dev/null +++ b/news/en/2016040201.xml @@ -0,0 +1,17 @@ +<news> +<date>April 2, 2016</date> +<title>Wine 1.9.7 Released</title> +<body> + The Wine development release 1.9.7 is now available. + <a href="{$root}/announce/1.9.7">What's new</a> in this release: +<ul> + <li>More work towards the WineD3D command stream.</li> + <li>More support for Shader Model 5 shaders.</li> + <li>C++ exception handling on x86-64.</li> + <li>Support for Windows-style static import libraries.</li> + <li>Performance fixes in the XML writer.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.7.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tessellator_partitioning opcode.
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 873912847e8e1a3cf86f02d8766e7da8e132db91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873912847e8e1a3cf86f02d87… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 1 11:21:39 2016 +0200 wined3d: Recognize SM5 dcl_tessellator_partitioning 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 | 29 +++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 10 ++++++++++ 5 files changed, 48 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 33746af..247c6f3 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_TEMPS */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, + /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89f5b5e..1c59d63 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8164,6 +8164,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, + /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4e1a617..eb8f13f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -76,6 +76,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TEMPS */ "dcl_temps", /* 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_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -1342,6 +1343,29 @@ static void shader_dump_tessellator_output_primitive(struct wined3d_string_buffe } } +static void shader_dump_tessellator_partitioning(struct wined3d_string_buffer *buffer, + enum wined3d_tessellator_partitioning partitioning) +{ + switch (partitioning) + { + case WINED3D_TESSELLATOR_PARTITIONING_INTEGER: + shader_addline(buffer, "integer"); + break; + case WINED3D_TESSELLATOR_PARTITIONING_POW2: + shader_addline(buffer, "pow2"); + break; + case WINED3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + shader_addline(buffer, "fractional_odd"); + break; + case WINED3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + shader_addline(buffer, "fractional_even"); + break; + default: + shader_addline(buffer, "unknown_tessellator_partitioning(%#x)", partitioning); + break; + } +} + static void shader_dump_sysval_semantic(struct wined3d_string_buffer *buffer, enum wined3d_sysval_semantic semantic) { unsigned int i; @@ -2148,6 +2172,11 @@ 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_output_primitive(&buffer, ins.declaration.tessellator_output_primitive); } + else if (ins.handler_idx == WINED3DSIH_DCL_TESSELLATOR_PARTITIONING) + { + 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_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 515061b..c5817be 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -199,6 +199,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, + WINED3D_SM5_OP_DCL_TESSELLATOR_PARTITIONING = 0x96, WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE = 0x97, WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, @@ -420,6 +421,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_DOMAIN, "", ""}, + {WINED3D_SM5_OP_DCL_TESSELLATOR_PARTITIONING, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, "", ""}, {WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, "", ""}, {WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, "", ""}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", ""}, @@ -1056,6 +1058,11 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->declaration.tessellator_output_primitive = (opcode_token & WINED3D_SM5_TESSELLATOR_MASK) >> WINED3D_SM5_TESSELLATOR_SHIFT; } + else if (opcode == WINED3D_SM5_OP_DCL_TESSELLATOR_PARTITIONING) + { + ins->declaration.tessellator_partitioning = (opcode_token & WINED3D_SM5_TESSELLATOR_MASK) + >> WINED3D_SM5_TESSELLATOR_SHIFT; + } else if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) { enum wined3d_sm4_output_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bcc82d..b089d37 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -454,6 +454,14 @@ enum wined3d_tessellator_output_primitive WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, }; +enum wined3d_tessellator_partitioning +{ + WINED3D_TESSELLATOR_PARTITIONING_INTEGER = 1, + WINED3D_TESSELLATOR_PARTITIONING_POW2 = 2, + WINED3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD = 3, + WINED3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = 4, +}; + /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 0x1 #define WINED3DSI_TEXLD_BIAS 0x2 @@ -548,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TEMPS, WINED3DSIH_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, + WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, @@ -876,6 +885,7 @@ struct wined3d_shader_instruction struct wined3d_shader_structured_resource structured_resource; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive; + enum wined3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; } declaration; };

1 0

Józef Kucia : wined3d: Get rid of long else-if sequence from shader_sm4_read_instruction().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: a69c92d6699a7111ff0247ce7be9b5db3027b19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69c92d6699a7111ff0247ce7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 1 11:21:40 2016 +0200 wined3d: Get rid of long else-if sequence from shader_sm4_read_instruction(). 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_sm4.c | 566 ++++++++++++++++++++++++++-------------------- 1 file changed, 324 insertions(+), 242 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a69c92d6699a7111ff024…

1 0

Józef Kucia : wined3d: Add domain shader type.
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: ea92105d41e8d468c1bdada203d80453be2bef5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea92105d41e8d468c1bdada20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 1 11:21:41 2016 +0200 wined3d: Add domain shader type. 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 | 4 ++- dlls/wined3d/context.c | 3 +- dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 8 ++++- dlls/wined3d/shader.c | 74 ++++++++++++++++++++++++++++++++++----- dlls/wined3d/shader_sm4.c | 4 +++ dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_main.c | 3 ++ dlls/wined3d/wined3d_private.h | 6 +++- include/wine/wined3d.h | 2 ++ 11 files changed, 94 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea92105d41e8d468c1bda…

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateDomainShader().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 37416f228239b6afa0e6f279566e62e9f10ae83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=37416f228239b6afa0e6f2795… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 1 11:21:42 2016 +0200 d3d11: Implement d3d11_device_CreateDomainShader(). 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/d3d11_private.h | 14 ++++ dlls/d3d11/device.c | 16 +++- dlls/d3d11/shader.c | 196 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 224 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b4614c0..17e9f9f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -264,6 +264,20 @@ struct d3d11_hull_shader HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d11_hull_shader **shader) DECLSPEC_HIDDEN; +/* ID3D11DomainShader */ +struct d3d11_domain_shader +{ + ID3D11DomainShader ID3D11DomainShader_iface; + LONG refcount; + + struct wined3d_private_store private_store; + struct wined3d_shader *wined3d_shader; + ID3D11Device *device; +}; + +HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_domain_shader **shader) DECLSPEC_HIDDEN; + /* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8a53e89..4e84dad 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2199,10 +2199,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device *ifa static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11DomainShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_domain_shader *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d11_domain_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11DomainShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index a91bec7..bf6bb32 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -667,6 +667,202 @@ HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_cod return S_OK; } +/* ID3D11DomainShader methods */ + +static inline struct d3d11_domain_shader *impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_domain_shader, ID3D11DomainShader_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_domain_shader_QueryInterface(ID3D11DomainShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11DomainShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11DomainShader_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *iface) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *iface) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + ID3D11Device *device = shader->device; + + wined3d_mutex_lock(); + wined3d_shader_decref(shader->wined3d_shader); + wined3d_mutex_unlock(); + + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D11Device_Release(device); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_domain_shader_GetDevice(ID3D11DomainShader *iface, + ID3D11Device **device) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = shader->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_domain_shader_GetPrivateData(ID3D11DomainShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_domain_shader_SetPrivateData(ID3D11DomainShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_domain_shader_SetPrivateDataInterface(ID3D11DomainShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&shader->private_store, guid, data); +} + +static const struct ID3D11DomainShaderVtbl d3d11_domain_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_domain_shader_QueryInterface, + d3d11_domain_shader_AddRef, + d3d11_domain_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_domain_shader_GetDevice, + d3d11_domain_shader_GetPrivateData, + d3d11_domain_shader_SetPrivateData, + d3d11_domain_shader_SetPrivateDataInterface, +}; + +static void STDMETHODCALLTYPE d3d11_domain_shader_wined3d_object_destroyed(void *parent) +{ + struct d3d11_domain_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d11_domain_shader_wined3d_parent_ops = +{ + d3d11_domain_shader_wined3d_object_destroyed, +}; + +static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, struct d3d_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct wined3d_shader_signature output_signature; + struct wined3d_shader_signature input_signature; + struct d3d_shader_info shader_info; + struct wined3d_shader_desc desc; + HRESULT hr; + + shader->ID3D11DomainShader_iface.lpVtbl = &d3d11_domain_shader_vtbl; + shader->refcount = 1; + wined3d_mutex_lock(); + wined3d_private_store_init(&shader->private_store); + + shader_info.input_signature = &input_signature; + shader_info.output_signature = &output_signature; + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) + { + WARN("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return hr; + } + + desc.byte_code = shader_info.shader_code; + desc.input_signature = &input_signature; + desc.output_signature = &output_signature; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); + + hr = wined3d_shader_create_ds(device->wined3d_device, &desc, shader, + &d3d11_domain_shader_wined3d_parent_ops, &shader->wined3d_shader); + shader_free_signature(&input_signature); + shader_free_signature(&output_signature); + if (FAILED(hr)) + { + WARN("Failed to create wined3d domain shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return E_INVALIDARG; + } + wined3d_mutex_unlock(); + + shader->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(shader->device); + + return S_OK; +} + +HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_domain_shader **shader) +{ + struct d3d11_domain_shader *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d11_domain_shader_init(object, device, byte_code, byte_code_length))) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created domain shader %p.\n", object); + *shader = object; + + return S_OK; +} + /* ID3D11GeometryShader methods */ static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface)

1 0

Alexandre Julliard : Release 1.9.7.
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 442e60b7e4c010e6622d524f47a2dd0d26ba19d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442e60b7e4c010e6622d524f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 2 00:02:39 2016 +0900 Release 1.9.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 775 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 461 insertions(+), 338 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=442e60b7e4c010e6622d5…

1 0