October 2021 - Wine-commits

Nikolay Sivov : d3d10/effect: Do not use internal value types.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 84eeeec433f31f892358e013917498d434470f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=84eeeec433f31f892358e013… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:14 2021 +0300 d3d10/effect: Do not use internal value types. 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/d3d10/d3d10_private.h | 13 ------------- dlls/d3d10/effect.c | 42 ++++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e5659507eeb..11b3b4e9482 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -40,19 +40,6 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -enum d3d10_effect_object_type -{ - D3D10_EOT_RASTERIZER_STATE = 0x0, - D3D10_EOT_DEPTH_STENCIL_STATE = 0x1, - D3D10_EOT_BLEND_STATE = 0x2, - D3D10_EOT_VERTEXSHADER = 0x6, - D3D10_EOT_PIXELSHADER = 0x7, - D3D10_EOT_GEOMETRYSHADER = 0x8, - D3D10_EOT_STENCIL_REF = 0x9, - D3D10_EOT_BLEND_FACTOR = 0xa, - D3D10_EOT_SAMPLE_MASK = 0xb, -}; - enum d3d10_effect_object_type_flags { D3D10_EOT_FLAG_GS_SO = 0x1, diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71ad3f64a05..bd104465222 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1485,36 +1485,34 @@ static HRESULT parse_fx10_annotations(const char *data, size_t data_size, const return hr; } -static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_effect_anonymous_shader *s, - enum d3d10_effect_object_type otype) +static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, D3D_SHADER_VARIABLE_TYPE basetype, + struct d3d10_effect_anonymous_shader *s) { struct d3d10_effect_variable *v = &s->shader; struct d3d10_effect_type *t = &s->type; - const char *shader = NULL; + const char *name = NULL; - switch (otype) + switch (basetype) { - case D3D10_EOT_VERTEXSHADER: - shader = "vertexshader"; - t->basetype = D3D10_SVT_VERTEXSHADER; + case D3D10_SVT_VERTEXSHADER: + name = "vertexshader"; break; - case D3D10_EOT_PIXELSHADER: - shader = "pixelshader"; - t->basetype = D3D10_SVT_PIXELSHADER; + case D3D10_SVT_PIXELSHADER: + name = "pixelshader"; break; - case D3D10_EOT_GEOMETRYSHADER: - shader = "geometryshader"; - t->basetype = D3D10_SVT_GEOMETRYSHADER; + case D3D10_SVT_GEOMETRYSHADER: + name = "geometryshader"; break; default: - FIXME("Unhandled object type %#x.\n", otype); + WARN("Unhandled shader type %#x.\n", basetype); return E_FAIL; } + t->basetype = basetype; - if (!copy_name(shader, &t->name)) + if (!copy_name(name, &t->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -1918,8 +1916,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size TRACE("Effect object starts at offset %#x.\n", value_offset); - if (FAILED(hr = parse_fx10_anonymous_shader(effect, - &effect->anonymous_shaders[effect->anonymous_shader_current], property_info->id))) + if (FAILED(hr = parse_fx10_anonymous_shader(effect, property_info->type, + &effect->anonymous_shaders[effect->anonymous_shader_current]))) return hr; variable = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; @@ -1938,17 +1936,17 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size TRACE("Stream output declaration: %s.\n", debugstr_a(variable->u.shader.stream_output_declaration)); } - switch (property_info->id) + switch (property_info->type) { - case D3D10_EOT_VERTEXSHADER: - case D3D10_EOT_PIXELSHADER: - case D3D10_EOT_GEOMETRYSHADER: + case D3D10_SVT_VERTEXSHADER: + case D3D10_SVT_PIXELSHADER: + case D3D10_SVT_GEOMETRYSHADER: if (FAILED(hr = parse_fx10_shader(data, data_size, value_offset, variable))) return hr; break; default: - FIXME("Unhandled object type %#x\n", property_info->id); + WARN("Unexpected shader type %#x.\n", property_info->type); return E_FAIL; }

1 0

Nikolay Sivov : d3d10/effect: Remove unused arguments from shader resources helper.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: f68f88e276ef7973554364753649c8fba6fd93be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68f88e276ef797355436475… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:16 2021 +0300 d3d10/effect: Remove unused arguments from shader resources helper. 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/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index bd104465222..14c18aa77db 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -618,7 +618,7 @@ static struct d3d10_effect_variable * d3d10_effect_get_variable_by_name( return effect->pool ? d3d10_effect_get_variable_by_name(effect->pool, name) : NULL; } -static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const void *data, size_t data_size) +static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v) { struct d3d10_effect_shader_variable *sv = &v->u.shader; struct d3d10_effect_shader_resource *sr; @@ -846,7 +846,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse memcpy(ID3D10Blob_GetBufferPointer(v->u.shader.bytecode), ptr, dxbc_size); - if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) + if (FAILED(hr = get_fx10_shader_resources(v))) return hr; switch (v->type->basetype)

1 0

Nikolay Sivov : d3d10/effect: Add a helper to return array element.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 920afea8cdd836b5c45d58d54fdf42ce1a3ed289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=920afea8cdd836b5c45d58d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:17 2021 +0300 d3d10/effect: Add a helper to return array element. 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/d3d10/effect.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 14c18aa77db..17a4c547a2c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -142,6 +142,13 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); } +static struct d3d10_effect_variable * d3d10_array_get_element(struct d3d10_effect_variable *v, + unsigned int index) +{ + if (!v->type->element_count) return v; + return &v->elements[index]; +} + enum d3d10_effect_container_type { D3D10_C_NONE, @@ -2152,7 +2159,8 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, const char **ptr, BOOL shared_type_desc, struct d3d10_effect_variable *v) { - unsigned int i, j; + struct d3d10_effect_variable *var; + unsigned int i, j, element_count; HRESULT hr; DWORD offset; @@ -2175,6 +2183,8 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, /* Shared variable description contains only type information. */ if (shared_type_desc) return S_OK; + element_count = max(v->type->element_count, 1); + switch (v->type->basetype) { case D3D10_SVT_TEXTURE: @@ -2186,12 +2196,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_TEXTURE2DMSARRAY: case D3D10_SVT_TEXTURE3D: case D3D10_SVT_TEXTURECUBE: - if (!v->type->element_count) - i = 1; - else - i = v->type->element_count; - - if (!(v->u.resource.srv = heap_calloc(i, sizeof(*v->u.resource.srv)))) + if (!(v->u.resource.srv = heap_calloc(element_count, sizeof(*v->u.resource.srv)))) { ERR("Failed to allocate shader resource view array memory.\n"); return E_OUTOFMEMORY; @@ -2218,19 +2223,11 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); - for (i = 0; i < max(v->type->element_count, 1); ++i) + for (i = 0; i < element_count; ++i) { DWORD shader_offset, sodecl_offset; - struct d3d10_effect_variable *var; - if (!v->type->element_count) - { - var = v; - } - else - { - var = &v->elements[i]; - } + var = d3d10_array_get_element(v, i); read_dword(ptr, &shader_offset); TRACE("Shader offset: %#x.\n", shader_offset); @@ -2261,7 +2258,6 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_SAMPLER: { const struct d3d10_effect_state_storage_info *storage_info; - unsigned int count = max(v->type->element_count, 1); if (!(storage_info = get_storage_info(v->type->basetype))) { @@ -2276,15 +2272,11 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return E_FAIL; } - for (i = 0; i < count; ++i) + for (i = 0; i < element_count; ++i) { - struct d3d10_effect_variable *var; unsigned int prop_count; - if (v->type->element_count) - var = &v->elements[i]; - else - var = v; + var = d3d10_array_get_element(v, i); read_dword(ptr, &prop_count); TRACE("State object property count: %#x.\n", prop_count); @@ -3969,10 +3961,9 @@ static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, const struct d3d10_effect_pass_shader_desc *shader_desc) { ID3D10Device *device = pass->technique->effect->device; - struct d3d10_effect_variable *v = shader_desc->shader; + struct d3d10_effect_variable *v; - if (v->type->element_count) - v = &v->elements[shader_desc->index]; + v = d3d10_array_get_element(shader_desc->shader, shader_desc->index); switch (v->type->basetype) { @@ -7081,8 +7072,7 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s { unsigned int i; - if (v->type->element_count) - v = &v->elements[0]; + v = d3d10_array_get_element(v, 0); if (!shader_index) {

1 0

Nikolay Sivov : d3d10/effect: Pick up resources from elements when shader variable arrays are used.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 64df3c61a5b7c86f29f292f131c14a41f027a154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64df3c61a5b7c86f29f292f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:18 2021 +0300 d3d10/effect: Pick up resources from elements when shader variable arrays are used. 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/d3d10/effect.c | 11 ++-------- dlls/d3d10/tests/effect.c | 54 +++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 17a4c547a2c..29d59f2620b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3979,6 +3979,8 @@ static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, default: WARN("Unexpected shader type %u.\n", v->type->basetype); } + + apply_shader_resources(device, v); } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) @@ -3991,20 +3993,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (flags) FIXME("Ignoring flags (%#x)\n", flags); if (pass->vs.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->vs); - apply_shader_resources(device, pass->vs.shader); - } if (pass->gs.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->gs); - apply_shader_resources(device, pass->gs.shader); - } if (pass->ps.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->ps); - apply_shader_resources(device, pass->ps.shader); - } if (pass->rasterizer) ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); if (pass->depth_stencil) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index dd16aab5aaa..93e82490eb0 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5946,43 +5946,47 @@ float4 PS( float4 pos : SV_POSITION ) : SV_Target return t_a[1].Sample(s[1], float2(0, 0)); } +PixelShader ps[1] = { CompileShader(ps_4_0, PS()) }; + technique10 rsrc_test { pass p0 { - SetPixelShader(CompileShader(ps_4_0, PS())); + SetPixelShader(ps[0]); } } #endif static DWORD fx_test_resource_variable2[] = { - 0x43425844, 0xb62313ac, 0x8116090b, 0xdc1d2951, 0xfc18ca42, 0x00000001, 0x0000035a, 0x00000001, - 0x00000024, 0x30315846, 0x0000032e, 0xfeff1001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x0000028a, 0x00000000, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x74786554, + 0x43425844, 0xecd43fcd, 0x0654927c, 0x71931f03, 0xf166cc09, 0x00000001, 0x0000039d, 0x00000001, + 0x00000024, 0x30315846, 0x00000371, 0xfeff1001, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x000002b5, 0x00000000, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x74786554, 0x32657275, 0x00040044, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x000c0000, 0x5f740000, 0x61530061, 0x656c706d, 0x61745372, 0x2e006574, 0x02000000, 0x02000000, 0x00000000, - 0x00000000, 0x00000000, 0x15000000, 0x73000000, 0x72737200, 0x65745f63, 0x70007473, 0x02180030, - 0x58440000, 0xb2424342, 0x3c889e83, 0xb8b8fc18, 0x749f2920, 0x0001877a, 0x02180000, 0x00050000, - 0x00340000, 0x00c80000, 0x00fc0000, 0x01300000, 0x019c0000, 0x44520000, 0x008c4645, 0x00000000, - 0x00000000, 0x00020000, 0x001c0000, 0x04000000, 0x0100ffff, 0x00620000, 0x005c0000, 0x00030000, - 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00020000, 0x00010000, 0x005e0000, 0x00020000, - 0x00050000, 0x00040000, 0xffff0000, 0x0000ffff, 0x00020000, 0x000c0000, 0x00730000, 0x00615f74, - 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, - 0x31207265, 0x00312e30, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, - 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, - 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, - 0x000f0000, 0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00645244, 0x00400000, 0x00190000, - 0x005a0000, 0x60000300, 0x00020010, 0x18580000, 0x70000400, 0x00010010, 0x55550000, 0x00650000, - 0x20f20300, 0x00000010, 0x00450000, 0x20f20c00, 0x00000010, 0x40020000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x7e460000, 0x00010010, 0x60000000, 0x00020010, 0x003e0000, 0x54530100, - 0x00745441, 0x00020000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, - 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, + 0x00000000, 0x00000000, 0x15000000, 0x73000000, 0x78695000, 0x68536c65, 0x72656461, 0x00005900, + 0x00000200, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000500, 0x00737000, 0x00000218, + 0x43425844, 0x9e83b242, 0xfc183c88, 0x2920b8b8, 0x877a749f, 0x00000001, 0x00000218, 0x00000005, + 0x00000034, 0x000000c8, 0x000000fc, 0x00000130, 0x0000019c, 0x46454452, 0x0000008c, 0x00000000, + 0x00000000, 0x00000002, 0x0000001c, 0xffff0400, 0x00000100, 0x00000062, 0x0000005c, 0x00000003, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000001, 0x0000005e, 0x00000002, + 0x00000005, 0x00000004, 0xffffffff, 0x00000000, 0x00000002, 0x0000000c, 0x5f740073, 0x694d0061, + 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, + 0x2e303120, 0xabab0031, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, + 0x0300005a, 0x00106000, 0x00000002, 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x03000065, + 0x001020f2, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000002, 0x0100003e, 0x54415453, + 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660000, 0x00000000, - 0x002a0000, 0x000e0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00570000, 0x003b0000, 0x00000000, - 0xffff0000, 0x0000ffff, 0x00000000, 0x00000000, 0x00590000, 0x00010000, 0x00000000, 0x00630000, - 0x00010000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x02820000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x63727372, 0x7365745f, + 0x30700074, 0x00008100, 0x00000000, 0x00002a00, 0x00000e00, 0x00000000, 0xffffff00, 0x000000ff, + 0x00005700, 0x00003b00, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00000000, 0x00008100, + 0x00006500, 0x00000000, 0xffffff00, 0x000084ff, 0x00000000, 0x0002a000, 0x00000100, 0x00000000, + 0x0002aa00, 0x00000100, 0x00000000, 0x00000700, 0x00000000, 0x00000300, 0x0002ad00, 0x00000000, }; static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderResourceView **srv,

1 0

Alexandre Julliard : msvcrt: Move _fdclass/_dclass to avoid forward references.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: da8176df6178e1dbf076fc2a88979e481cba13a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8176df6178e1dbf076fc2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 11:05:13 2021 +0200 msvcrt: Move _fdclass/_dclass to avoid forward references. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7f59a4d20d4..3af44f83a08 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -703,6 +703,36 @@ static const UINT64 exp2f_T[] = { }; #endif +/********************************************************************* + * _fdclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassifyf.c + */ +short CDECL _fdclass(float x) +{ + union { float f; UINT32 i; } u = { x }; + int e = u.i >> 23 & 0xff; + + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; + return FP_NORMAL; +} + +/********************************************************************* + * _dclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassify.c + */ +short CDECL _dclass(double x) +{ + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; + + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; + return FP_NORMAL; +} + #ifndef __i386__ /********************************************************************* @@ -7827,36 +7857,6 @@ void __cdecl __libm_sse2_sqrt_precise(void) } #endif /* __i386__ */ -/********************************************************************* - * _fdclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassifyf.c - */ -short CDECL _fdclass(float x) -{ - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - -/********************************************************************* - * _dclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassify.c - */ -short CDECL _dclass(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - #if _MSVCR_VER>=120 /*********************************************************************

1 0

Alexandre Julliard : include: Define fpclassify().
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 29717168359b152fe7a8d7dd53d990955692d693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29717168359b152fe7a8d7dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 11:05:38 2021 +0200 include: Define fpclassify(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index d4db618f542..da07303bcd9 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -251,11 +251,22 @@ static const union { #define FP_ILOGB0 (-0x7fffffff - _C2) #define FP_ILOGBNAN 0x7fffffff +#if _MSVCR_VER >= 120 + _ACRTIMP short __cdecl _dclass(double); _ACRTIMP short __cdecl _fdclass(float); _ACRTIMP int __cdecl _dsign(double); _ACRTIMP int __cdecl _fdsign(float); +#define fpclassify(x) (sizeof(x) == sizeof(float) ? _fdclass(x) : _dclass(x)) +#define signbit(x) (sizeof(x) == sizeof(float) ? _fdsign(x) : _dsign(x)) +#define isinf(x) (fpclassify(x) == FP_INFINITE) +#define isnan(x) (fpclassify(x) == FP_NAN) +#define isnormal(x) (fpclassify(x) == FP_NORMAL) +#define isfinite(x) (fpclassify(x) <= 0) + +#else + static inline int __isnanf(float x) { union { float x; unsigned int i; } u = { x }; @@ -303,6 +314,8 @@ static inline int __signbit(double x) #define signbit(x) (sizeof(x) == sizeof(float) ? __signbitf(x) : __signbit(x)) #define isfinite(x) (!isinf(x) && !isnan(x)) +#endif + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : include: Use the standard va_list instead of __ms_va_list when building with msvcrt.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 2a92c58e1152e1d80395cf31d7cd3f282d094540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a92c58e1152e1d80395cf31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 18:07:41 2021 +0200 include: Use the standard va_list instead of __ms_va_list when building with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/msipriv.h | 2 +- dlls/msvcrt/undname.c | 2 +- dlls/rsaenh/mpi.c | 4 +- dlls/rsaenh/tomcrypt.h | 4 +- dlls/ucrtbase/printf.c | 4 +- include/msvcrt/corecrt.h | 26 +++--- include/msvcrt/corecrt_wstdio.h | 174 ++++++++++++++++++++-------------------- include/msvcrt/stdio.h | 162 ++++++++++++++++++------------------- programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 4 +- programs/winedbg/expr.c | 2 +- 12 files changed, 191 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a92c58e1152e1d80395…

1 0

Zebediah Figura : wined3d: Omit GL_MAP_FLUSH_EXPLICIT_BIT for incoherent maps when ARB_MAP_BUFFER_RANGE is used.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 86e4d3aa8c971182661ad07afe0499dd598cb3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=86e4d3aa8c971182661ad07a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 14 23:44:16 2021 -0500 wined3d: Omit GL_MAP_FLUSH_EXPLICIT_BIT for incoherent maps when ARB_MAP_BUFFER_RANGE is used. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 27 +++++++++++++++------------ dlls/wined3d/resource.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b08003c697a..4510fe5b155 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2712,7 +2712,7 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(flags))); + map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(bo, flags))); } else { @@ -2754,21 +2754,24 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (!bo->coherent) { - for (i = 0; i < range_count; ++i) + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - GL_EXTCALL(glFlushMappedBufferRange(bo->binding, - (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + for (i = 0; i < range_count; ++i) + { + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + } } - } - else if (!bo->coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) - { - for (i = 0; i < range_count; ++i) + else if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, - (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); + for (i = 0; i < range_count; ++i) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } } } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f31996595c..abf07682c76 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -388,12 +388,16 @@ GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *reso return flags; } -GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) +GLbitfield wined3d_resource_gl_map_flags(const struct wined3d_bo_gl *bo, DWORD d3d_flags) { GLbitfield ret = 0; if (d3d_flags & WINED3D_MAP_WRITE) - ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + { + ret |= GL_MAP_WRITE_BIT; + if (!bo->coherent) + ret |= GL_MAP_FLUSH_EXPLICIT_BIT; + } if (d3d_flags & WINED3D_MAP_READ) ret |= GL_MAP_READ_BIT; else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 161d36ad76c..41956f1f061 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4217,7 +4217,7 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; -GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_resource_gl_map_flags(const struct wined3d_bo_gl *bo, DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Move the "coherent" field from struct wined3d_bo_gl to struct wined3d_bo.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 2d05178b28a74064f1600caf9642d6f8dda16fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d05178b28a74064f1600caf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 14 23:44:17 2021 -0500 wined3d: Move the "coherent" field from struct wined3d_bo_gl to struct wined3d_bo. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/context_gl.c | 6 +++--- dlls/wined3d/context_vk.c | 1 + dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8c3e63aac49..ffeffb4d145 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -983,7 +983,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, wined3d_context_vk_reference_bo(context_vk, bo); } - if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + if (!bo->b.coherent) { range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; range.pNext = NULL; @@ -1024,7 +1024,7 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); - if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + if (!bo->b.coherent) { range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; range.pNext = NULL; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4510fe5b155..2bc63464f7b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2684,7 +2684,7 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, if ((flags & WINED3D_MAP_DISCARD) && bo->command_fence_id > device_gl->completed_fence_id) { if (wined3d_context_gl_create_bo(context_gl, bo->size, - bo->binding, bo->usage, bo->coherent, bo->flags, &tmp)) + bo->binding, bo->usage, bo->b.coherent, bo->flags, &tmp)) { list_move_head(&tmp.b.users, &bo->b.users); wined3d_context_gl_destroy_bo(context_gl, bo); @@ -2754,7 +2754,7 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (!bo->coherent) + if (!bo->b.coherent) { if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -2889,7 +2889,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei bo->binding = binding; bo->usage = usage; bo->flags = flags; - bo->coherent = coherent; + bo->b.coherent = coherent; list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad2f7adfe0b..8e055202ec2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -492,6 +492,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic bo->size = size; bo->usage = usage; bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; + bo->b.coherent = !!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT); list_init(&bo->b.users); bo->command_buffer_id = 0; bo->slab = NULL; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index abf07682c76..c8fb4cf2e29 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -395,7 +395,7 @@ GLbitfield wined3d_resource_gl_map_flags(const struct wined3d_bo_gl *bo, DWORD d if (d3d_flags & WINED3D_MAP_WRITE) { ret |= GL_MAP_WRITE_BIT; - if (!bo->coherent) + if (!bo->b.coherent) ret |= GL_MAP_FLUSH_EXPLICIT_BIT; } if (d3d_flags & WINED3D_MAP_READ) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41956f1f061..993d0b3c4e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1592,6 +1592,7 @@ struct wined3d_bo { struct list users; size_t memory_offset; + bool coherent; }; struct wined3d_bo_gl @@ -1604,7 +1605,6 @@ struct wined3d_bo_gl GLenum usage; GLbitfield flags; - bool coherent; uint64_t command_fence_id; };

1 0

Zebediah Figura : wined3d: Move the "map_ptr" field from struct wined3d_bo_vk to struct wined3d_bo.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 6e7779ace9aa3ca709e01d94339b2e4bc12fd10b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7779ace9aa3ca709e01d94… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 14 23:44:18 2021 -0500 wined3d: Move the "map_ptr" field from struct wined3d_bo_vk to struct wined3d_bo. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 14 +++++++------- dlls/wined3d/context_gl.c | 1 + dlls/wined3d/context_vk.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ffeffb4d145..c7005835d16 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -775,15 +775,15 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ struct wined3d_bo_slab_vk *slab; VkResult vr; - if (bo->map_ptr) - return bo->map_ptr; + if (bo->b.map_ptr) + return bo->b.map_ptr; vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); if ((slab = bo->slab)) { - if (!(bo->map_ptr = wined3d_bo_slab_vk_map(slab, context_vk))) + if (!(bo->b.map_ptr = wined3d_bo_slab_vk_map(slab, context_vk))) { ERR("Failed to map slab.\n"); return NULL; @@ -793,19 +793,19 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ { struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(bo->memory->chunk); - if (!(bo->map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) + if (!(bo->b.map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) { ERR("Failed to map chunk.\n"); return NULL; } } - else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->map_ptr))) < 0) + else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->b.map_ptr))) < 0) { ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); return NULL; } - return bo->map_ptr; + return bo->b.map_ptr; } static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) @@ -817,7 +817,7 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context if (wined3d_map_persistent()) return; - bo->map_ptr = NULL; + bo->b.map_ptr = NULL; if ((slab = bo->slab)) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2bc63464f7b..5cde971cd43 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2893,6 +2893,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; + bo->b.map_ptr = NULL; return true; } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8e055202ec2..8bcd6d61eb3 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -487,7 +487,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } - bo->map_ptr = NULL; + bo->b.map_ptr = NULL; bo->buffer_offset = 0; bo->size = size; bo->usage = usage; @@ -907,7 +907,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if ((slab_vk = bo->slab)) { - if (bo->map_ptr) + if (bo->b.map_ptr) wined3d_bo_slab_vk_unmap(slab_vk, context_vk); object_size = slab_vk->bo.size / 32; idx = bo->buffer_offset / object_size; @@ -918,13 +918,13 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const wined3d_context_vk_destroy_vk_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); if (bo->memory) { - if (bo->map_ptr) + if (bo->b.map_ptr) wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); wined3d_context_vk_destroy_allocator_block(context_vk, bo->memory, bo->command_buffer_id); return; } - if (bo->map_ptr) + if (bo->b.map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 993d0b3c4e4..1f167c9e7dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1591,6 +1591,7 @@ do { \ struct wined3d_bo { struct list users; + void *map_ptr; size_t memory_offset; bool coherent; }; @@ -1628,7 +1629,6 @@ struct wined3d_bo_vk struct wined3d_bo_slab_vk *slab; VkDeviceMemory vk_memory; - void *map_ptr; VkDeviceSize buffer_offset; VkDeviceSize size;

1 0