wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Conor McCarthy : vkd3d-shader: Implement DTOF instruction.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: vkd3d Branch: master Commit: 580747b224003ff626c07bf94e06fac79ea89627 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=580747b224003ff626c07bf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Aug 12 12:55:12 2021 +1000 vkd3d-shader: Implement DTOF instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0c59056..86ba18a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -807,6 +807,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DNE, VKD3DSIH_DNE, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_DMOVC, VKD3DSIH_DMOVC, "d", "udd"}, + {VKD3D_SM5_OP_DTOF, VKD3DSIH_DTOF, "f", "d"}, {VKD3D_SM5_OP_FTOD, VKD3DSIH_FTOD, "d", "f"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 5f4f22d..34b90c8 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -327,6 +327,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DNE = 0xc6, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_DMOVC = 0xc8, + VKD3D_SM5_OP_DTOF = 0xc9, VKD3D_SM5_OP_FTOD = 0xca, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a50a309..266db18 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6776,6 +6776,7 @@ static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_i {VKD3DSIH_DDIV, SpvOpFDiv}, {VKD3DSIH_DIV, SpvOpFDiv}, {VKD3DSIH_DMUL, SpvOpFMul}, + {VKD3DSIH_DTOF, SpvOpFConvert}, {VKD3DSIH_FTOD, SpvOpFConvert}, {VKD3DSIH_FTOI, SpvOpConvertFToS}, {VKD3DSIH_FTOU, SpvOpConvertFToU}, @@ -9529,6 +9530,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DDIV: case VKD3DSIH_DIV: case VKD3DSIH_DMUL: + case VKD3DSIH_DTOF: case VKD3DSIH_FTOD: case VKD3DSIH_FTOI: case VKD3DSIH_FTOU: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 8f93e1b..eab3882 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -128,6 +128,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DSY */ "dsy", /* VKD3DSIH_DSY_COARSE */ "deriv_rty_coarse", /* VKD3DSIH_DSY_FINE */ "deriv_rty_fine", + /* VKD3DSIH_DTOF */ "dtof", /* VKD3DSIH_ELSE */ "else", /* VKD3DSIH_EMIT */ "emit", /* VKD3DSIH_EMIT_STREAM */ "emit_stream", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7400be5..8980e64 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -217,6 +217,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DSY, VKD3DSIH_DSY_COARSE, VKD3DSIH_DSY_FINE, + VKD3DSIH_DTOF, VKD3DSIH_ELSE, VKD3DSIH_EMIT, VKD3DSIH_EMIT_STREAM, diff --git a/tests/d3d12.c b/tests/d3d12.c index 4c03b81..f409ac6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10029,7 +10029,7 @@ static void test_shader_instructions(void) {&ps_dtou, {.d = {{ -1.0}}}, {{ 0, 1 }}, true, true}, {&ps_dtou, {.d = {{ 1.0}}}, {{ 1, 0 }}, true, true}, {&ps_dtoi, {.d = {{ 1.0}}}, {.i = {1, -1}}, true, true}, - {&ps_dtof, {.d = {{ 1.5}}}, {.f = {1.5f, -1.5f}}, true, true}, + {&ps_dtof, {.d = {{ 1.5}}}, {.f = {1.5f, -1.5f}}, true}, {&ps_utod, {.u = {{3, 0xffffffff}}}, {.d = {3.0, 4294967295.0}}, true, true}, {&ps_itod, {.u = {{3, INT_MIN}}}, {.d = {3.0, -2147483648.0}}, true, true}, {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true},

1 0

Conor McCarthy : vkd3d-shader: Implement FTOD instruction.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: vkd3d Branch: master Commit: 821389d274d6459a38c2c3fc8df939501ac1c858 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=821389d274d6459a38c2c3f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Aug 12 12:55:11 2021 +1000 vkd3d-shader: Implement FTOD instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index fab1904..0c59056 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -807,6 +807,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DNE, VKD3DSIH_DNE, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_DMOVC, VKD3DSIH_DMOVC, "d", "udd"}, + {VKD3D_SM5_OP_FTOD, VKD3DSIH_FTOD, "d", "f"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 335f016..5f4f22d 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -327,6 +327,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DNE = 0xc6, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_DMOVC = 0xc8, + VKD3D_SM5_OP_FTOD = 0xca, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4e67af4..a50a309 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6776,6 +6776,7 @@ static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_i {VKD3DSIH_DDIV, SpvOpFDiv}, {VKD3DSIH_DIV, SpvOpFDiv}, {VKD3DSIH_DMUL, SpvOpFMul}, + {VKD3DSIH_FTOD, SpvOpFConvert}, {VKD3DSIH_FTOI, SpvOpConvertFToS}, {VKD3DSIH_FTOU, SpvOpConvertFToU}, {VKD3DSIH_IADD, SpvOpIAdd}, @@ -9528,6 +9529,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DDIV: case VKD3DSIH_DIV: case VKD3DSIH_DMUL: + case VKD3DSIH_FTOD: case VKD3DSIH_FTOI: case VKD3DSIH_FTOU: case VKD3DSIH_IADD: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 830a5fc..8f93e1b 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -147,6 +147,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_FIRSTBIT_LO */ "firstbit_lo", /* VKD3DSIH_FIRSTBIT_SHI */ "firstbit_shi", /* VKD3DSIH_FRC */ "frc", + /* VKD3DSIH_FTOD */ "ftod", /* VKD3DSIH_FTOI */ "ftoi", /* VKD3DSIH_FTOU */ "ftou", /* VKD3DSIH_GATHER4 */ "gather4", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9948045..7400be5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -236,6 +236,7 @@ enum vkd3d_shader_opcode VKD3DSIH_FIRSTBIT_LO, VKD3DSIH_FIRSTBIT_SHI, VKD3DSIH_FRC, + VKD3DSIH_FTOD, VKD3DSIH_FTOI, VKD3DSIH_FTOU, VKD3DSIH_GATHER4, diff --git a/tests/d3d12.c b/tests/d3d12.c index 2b1830b..4c03b81 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10032,7 +10032,7 @@ static void test_shader_instructions(void) {&ps_dtof, {.d = {{ 1.5}}}, {.f = {1.5f, -1.5f}}, true, true}, {&ps_utod, {.u = {{3, 0xffffffff}}}, {.d = {3.0, 4294967295.0}}, true, true}, {&ps_itod, {.u = {{3, INT_MIN}}}, {.d = {3.0, -2147483648.0}}, true, true}, - {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true, true}, + {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true}, {&ps_dmul, {.d = {{ 1.5, 3.0}}}, {.d = { 4.5, -4.5}}, true}, {&ps_ddiv, {.d = {{ 2.0, 4.0}}}, {.d = { 0.5, 2.0}}, true}, {&ps_ddiv, {.d = {{ 2.0, -4.0}}}, {.d = {-0.5, -2.0}}, true},

1 0

Huw Davies : iphlpapi: Implement GetIpStatisticsEx() on top of nsi.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 91494ae6f2e47254d15a47e292ff569f3b400be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91494ae6f2e47254d15a47e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 11 11:01:31 2021 +0100 iphlpapi: Implement GetIpStatisticsEx() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 82 ++++++++++++++ dlls/iphlpapi/ipstats.c | 252 ------------------------------------------ dlls/nsi/tests/nsi.c | 4 - 3 files changed, 82 insertions(+), 256 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91494ae6f2e47254d15a…

1 0

Huw Davies : nsiproxy: Implement IP compartment get_all_paramters.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: a7849502602be3237d60fe0afd899e1cca999444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7849502602be3237d60fe0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 11 11:01:30 2021 +0100 nsiproxy: Implement IP compartment get_all_paramters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 42 ++++++++++++ dlls/nsiproxy.sys/ip.c | 121 +++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 29 +++++++++ include/wine/nsi.h | 17 +++++ 4 files changed, 209 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7849502602be3237d60…

1 0

Huw Davies : nsiproxy: Implement IPv6 ipstats get_all_parameters on linux.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 68498fc3e9cfe1f1487e0f9a3886be121fe1359b URL: https://source.winehq.org/git/wine.git/?a=commit;h=68498fc3e9cfe1f1487e0f9a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 11 11:01:29 2021 +0100 nsiproxy: Implement IPv6 ipstats get_all_parameters on linux. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 1 - dlls/nsiproxy.sys/ip.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index dd1a552cce6..feed72a1626 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -424,7 +424,6 @@ static void test_ip_ipstats( int family ) /* The table appears to consist of a single object without a key. The rw data does exist but isn't part of GetIpStatisticsEx() and isn't yet tested */ err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, &dyn, sizeof(dyn), &stat, sizeof(stat) ); -todo_wine_if( family == AF_INET6 ) ok( !err, "got %x\n", err ); if (err) goto err; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 438ae219174..fbb230dccee 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -226,6 +226,82 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size #endif } +static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_ipstats_dynamic dyn; + struct nsi_ip_ipstats_static stat; + + memset( &dyn, 0, sizeof(dyn) ); + memset( &stat, 0, sizeof(stat) ); + +#ifdef __linux__ + { + struct + { + const char *name; + void *elem; + int size; + } ipstatlist[] = + { +#define X(x) &x, sizeof(x) + { "Ip6InReceives", X( dyn.in_recv ) }, + { "Ip6InHdrErrors", X( dyn.in_hdr_errs ) }, + { "Ip6InAddrErrors", X( dyn.in_addr_errs ) }, + { "Ip6OutForwDatagrams", X( dyn.fwd_dgrams ) }, + { "Ip6InUnknownProtos", X( dyn.in_unk_protos ) }, + { "Ip6InDiscards", X( dyn.in_discards ) }, + { "Ip6InDelivers", X( dyn.in_delivers ) }, + { "Ip6OutRequests", X( dyn.out_reqs ) }, + { "Ip6OutDiscards", X( dyn.out_discards ) }, + { "Ip6OutNoRoutes", X( dyn.out_no_routes ) }, + { "Ip6ReasmTimeout", X( stat.reasm_timeout ) }, + { "Ip6ReasmReqds", X( dyn.reasm_reqds ) }, + { "Ip6ReasmOKs", X( dyn.reasm_oks ) }, + { "Ip6ReasmFails", X( dyn.reasm_fails ) }, + { "Ip6FragOKs", X( dyn.frag_oks ) }, + { "Ip6FragFails", X( dyn.frag_fails ) }, + { "Ip6FragCreates", X( dyn.frag_creates ) }, + /* no routingDiscards */ +#undef X + }; + NTSTATUS status = STATUS_NOT_SUPPORTED; + char buf[512], *ptr, *value; + DWORD i; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp6", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (!(value = strchr( buf, ' ' ))) continue; + /* terminate the valuename */ + *value++ = '\0'; + /* and strip leading spaces from value */ + while (*value == ' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; + + for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) + if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + { + if (ipstatlist[i].size == sizeof(long)) + *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); + else + *(long long *)ipstatlist[i].elem = strtoull( value, NULL, 10 ); + status = STATUS_SUCCESS; + } + } + fclose( fp ); + if (dynamic_data) *(struct nsi_ip_ipstats_dynamic *)dynamic_data = dyn; + if (static_data) *(struct nsi_ip_ipstats_static *)static_data = stat; + return status; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_unicast_rw *rw, struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) { @@ -840,6 +916,15 @@ const struct module ipv4_module = static struct module_table ipv6_tables[] = { + { + NSI_IP_IPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_ipstats_dynamic), sizeof(struct nsi_ip_ipstats_static) + }, + NULL, + ipv6_ipstats_get_all_parameters, + }, { NSI_IP_UNICAST_TABLE, {

1 0

Huw Davies : nsiproxy: Implement IPv4 ipstats get_all_parameters.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 2f3fc13c8ca5a2c5a61a06079d610f7881bf9bff URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f3fc13c8ca5a2c5a61a0607… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 11 11:01:28 2021 +0100 nsiproxy: Implement IPv4 ipstats get_all_parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 50 +++++++++++++++++++++ dlls/nsiproxy.sys/ip.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 35 +++++++++++++++ 3 files changed, 200 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f3fc13c8ca5a2c5a61a…

1 0

Nikolay Sivov : d3dx10: Forward D3DX10CreateEffectFromFileA() to D3DX10CreateEffectFromFileW().
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 1e0f7d64890815c2e085edaff57ae1a6a8bf0b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e0f7d64890815c2e085edaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 11 17:38:51 2021 +0200 d3dx10: Forward D3DX10CreateEffectFromFileA() to D3DX10CreateEffectFromFileW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/compiler.c | 30 ++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 13 ------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 932bdadea1a..0bda2712d76 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -18,6 +18,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #define COBJMACROS @@ -93,3 +94,32 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH return hr; } + +HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT shader_flags, UINT effect_flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, + ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) +{ + WCHAR *filenameW; + HRESULT hr; + int len; + + TRACE("filename %s, defines %p, include %p, profile %s, shader_flags %#x, effect_flags %#x, " + "device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n", + debugstr_a(filename), defines, include, debugstr_a(profile), shader_flags, effect_flags, + device, effect_pool, pump, effect, errors, hresult); + + if (!filename) + return E_INVALIDARG; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + if (!(filenameW = heap_alloc(len * sizeof(*filenameW)))) + return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len); + + hr = D3DX10CreateEffectFromFileW(filenameW, defines, include, profile, shader_flags, + effect_flags, device, effect_pool, pump, effect, errors, hresult); + heap_free(filenameW); + + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 2c53924ac20..42f29ad6239 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -48,19 +48,6 @@ BOOL WINAPI D3DX10CheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) return FALSE; } -HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, - ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, - ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, - HRESULT *hresult) -{ - FIXME("filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " - "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p\n", - debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, - device, effectpool, pump, effect, errors, hresult); - - return E_NOTIMPL; -} - HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool,

1 0

Nikolay Sivov : d3dcompiler: Improve D3D11_SHADER_DESC returned by reflection interface.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 741c73d1375b7381a929e0e6042be2a2813894c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741c73d1375b7381a929e0e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 11 12:17:09 2021 +0300 d3dcompiler: Improve D3D11_SHADER_DESC returned by reflection interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 8b893fe76db..97abad4da30 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -387,7 +387,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); FIXME("iface %p, desc %p partial stub!\n", iface, desc); @@ -397,41 +397,41 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha return E_FAIL; } - desc->Version = This->version; - desc->Creator = This->creator; - desc->Flags = This->flags; - desc->ConstantBuffers = This->constant_buffer_count; - desc->BoundResources = This->bound_resource_count; - desc->InputParameters = This->isgn ? This->isgn->element_count : 0; - desc->OutputParameters = This->osgn ? This->osgn->element_count : 0; - desc->InstructionCount = This->instruction_count; - desc->TempRegisterCount = This->temp_register_count; - desc->TempArrayCount = This->temp_array_count; - desc->DefCount = 0; - desc->DclCount = This->dcl_count; - desc->TextureNormalInstructions = This->texture_normal_instructions; - desc->TextureLoadInstructions = This->texture_load_instructions; - desc->TextureCompInstructions = This->texture_comp_instructions; - desc->TextureBiasInstructions = This->texture_bias_instructions; - desc->TextureGradientInstructions = This->texture_gradient_instructions; - desc->FloatInstructionCount = This->float_instruction_count; - desc->IntInstructionCount = This->int_instruction_count; - desc->UintInstructionCount = This->uint_instruction_count; - desc->StaticFlowControlCount = This->static_flow_control_count; - desc->DynamicFlowControlCount = This->dynamic_flow_control_count; - desc->MacroInstructionCount = 0; - desc->ArrayInstructionCount = This->array_instruction_count; - desc->CutInstructionCount = This->cut_instruction_count; - desc->EmitInstructionCount = This->emit_instruction_count; - desc->GSOutputTopology = This->gs_output_topology; - desc->GSMaxOutputVertexCount = This->gs_max_output_vertex_count; - desc->InputPrimitive = This->input_primitive; - desc->PatchConstantParameters = This->pcsg ? This->pcsg->element_count : 0; + desc->Version = reflection->version; + desc->Creator = reflection->creator; + desc->Flags = reflection->flags; + desc->ConstantBuffers = reflection->constant_buffer_count; + desc->BoundResources = reflection->bound_resource_count; + desc->InputParameters = reflection->isgn ? reflection->isgn->element_count : 0; + desc->OutputParameters = reflection->osgn ? reflection->osgn->element_count : 0; + desc->InstructionCount = reflection->instruction_count; + desc->TempRegisterCount = reflection->temp_register_count; + desc->TempArrayCount = reflection->temp_array_count; + desc->DefCount = reflection->def_count; + desc->DclCount = reflection->dcl_count; + desc->TextureNormalInstructions = reflection->texture_normal_instructions; + desc->TextureLoadInstructions = reflection->texture_load_instructions; + desc->TextureCompInstructions = reflection->texture_comp_instructions; + desc->TextureBiasInstructions = reflection->texture_bias_instructions; + desc->TextureGradientInstructions = reflection->texture_gradient_instructions; + desc->FloatInstructionCount = reflection->float_instruction_count; + desc->IntInstructionCount = reflection->int_instruction_count; + desc->UintInstructionCount = reflection->uint_instruction_count; + desc->StaticFlowControlCount = reflection->static_flow_control_count; + desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; + desc->MacroInstructionCount = reflection->macro_instruction_count; + desc->ArrayInstructionCount = reflection->array_instruction_count; + desc->CutInstructionCount = reflection->cut_instruction_count; + desc->EmitInstructionCount = reflection->emit_instruction_count; + desc->GSOutputTopology = reflection->gs_output_topology; + desc->GSMaxOutputVertexCount = reflection->gs_max_output_vertex_count; + desc->InputPrimitive = reflection->input_primitive; + desc->PatchConstantParameters = reflection->pcsg ? reflection->pcsg->element_count : 0; desc->cGSInstanceCount = 0; - desc->cControlPoints = This->c_control_points; - desc->HSOutputPrimitive = This->hs_output_primitive; - desc->HSPartitioning = This->hs_partitioning; - desc->TessellatorDomain = This->tessellator_domain; + desc->cControlPoints = reflection->c_control_points; + desc->HSOutputPrimitive = reflection->hs_output_primitive; + desc->HSPartitioning = reflection->hs_partitioning; + desc->TessellatorDomain = reflection->tessellator_domain; desc->cBarrierInstructions = 0; desc->cInterlockedInstructions = 0; desc->cTextureStoreInstructions = 0;

1 0

Nikolay Sivov : d3dcompiler: Improve d3d10_shader_reflection_GetDesc() to return missing stats.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: ff98978836b9cd0fa531f4e807050da2072b448e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff98978836b9cd0fa531f4e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 11 12:17:08 2021 +0300 d3dcompiler: Improve d3d10_shader_reflection_GetDesc() to return missing stats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index bd064793587..8b893fe76db 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -124,6 +124,7 @@ struct d3dcompiler_shader_reflection UINT gs_max_output_vertex_count; D3D_PRIMITIVE input_primitive; UINT cut_instruction_count; + UINT def_count; UINT dcl_count; UINT static_flow_control_count; UINT float_instruction_count; @@ -138,6 +139,7 @@ struct d3dcompiler_shader_reflection UINT texture_bias_instructions; UINT texture_gradient_instructions; UINT dynamic_flow_control_count; + UINT macro_instruction_count; UINT c_control_points; D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; @@ -1098,7 +1100,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->temp_register_count = read_dword(&ptr); TRACE("TempRegisterCount: %u\n", r->temp_register_count); - skip_dword_unknown(&ptr, 1); + r->def_count = read_dword(&ptr); + TRACE("DefCount: %u\n", r->def_count); r->dcl_count = read_dword(&ptr); TRACE("DclCount: %u\n", r->dcl_count); @@ -1118,7 +1121,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->dynamic_flow_control_count = read_dword(&ptr); TRACE("DynamicFlowControlCount: %u\n", r->dynamic_flow_control_count); - skip_dword_unknown(&ptr, 1); + r->macro_instruction_count = read_dword(&ptr); + TRACE("MacroInstructionCount: %u\n", r->macro_instruction_count); r->temp_array_count = read_dword(&ptr); TRACE("TempArrayCount: %u\n", r->temp_array_count); @@ -1917,7 +1921,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (!desc) { @@ -1935,7 +1939,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->InstructionCount = reflection->instruction_count; desc->TempRegisterCount = reflection->temp_register_count; desc->TempArrayCount = reflection->temp_array_count; - desc->DefCount = 0; + desc->DefCount = reflection->def_count; desc->DclCount = reflection->dcl_count; desc->TextureNormalInstructions = reflection->texture_normal_instructions; desc->TextureLoadInstructions = reflection->texture_load_instructions; @@ -1947,7 +1951,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->UintInstructionCount = reflection->uint_instruction_count; desc->StaticFlowControlCount = reflection->static_flow_control_count; desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; - desc->MacroInstructionCount = 0; + desc->MacroInstructionCount = reflection->macro_instruction_count; desc->ArrayInstructionCount = reflection->array_instruction_count; desc->CutInstructionCount = reflection->cut_instruction_count; desc->EmitInstructionCount = reflection->emit_instruction_count;

1 0

Nikolay Sivov : include: Fix copy-paste issue in d3dx10core.h.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: bf20e08ae2888bb7b13edb4cfeb44c8904887354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf20e08ae2888bb7b13edb4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 11 12:12:09 2021 +0300 include: Fix copy-paste issue in d3dx10core.h. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dx10core.h b/include/d3dx10core.h index d794fa028d7..3ed6f6f2443 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -247,7 +247,7 @@ DECLARE_INTERFACE_(ID3DX10Font, IUnknown) #define ID3DX10Font_AddRef(p) (p)->lpVtbl->AddRef(p) #define ID3DX10Font_Release(p) (p)->lpVtbl->Release(p) /*** ID3DX10Font methods ***/ -#define ID3DX10Font_GetDevice(p,a) (p)->lpVtbl->Begin(p,a) +#define ID3DX10Font_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define ID3DX10Font_GetDescA(p,a) (p)->lpVtbl->GetDescA(p,a) #define ID3DX10Font_GetDescW(p,a) (p)->lpVtbl->GetDescW(p,a) #define ID3DX10Font_GetTextMetricsA(p,a) (p)->lpVtbl->GetTextMetricsA(p,a) @@ -266,7 +266,7 @@ DECLARE_INTERFACE_(ID3DX10Font, IUnknown) #define ID3DX10Font_AddRef(p) (p)->AddRef() #define ID3DX10Font_Release(p) (p)->Release() /*** ID3DX10Font methods ***/ -#define ID3DX10Font_GetDevice(p,a) (p)->Begin(a) +#define ID3DX10Font_GetDevice(p,a) (p)->GetDevice(a) #define ID3DX10Font_GetDescA(p,a) (p)->GetDescA(a) #define ID3DX10Font_GetDescW(p,a) (p)->GetDescW(a) #define ID3DX10Font_GetTextMetricsA(p,a) (p)->GetTextMetricsA(a)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021