June 2023 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader/dxil: Read and validate DXIL bitcode unabbreviated blocks.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: 6775f7ba66a1d582a72dbc212aed427f62c4013f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6775f7ba66a1d582a72dbc212aed4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 15 15:16:41 2022 +1000 vkd3d-shader/dxil: Read and validate DXIL bitcode unabbreviated blocks. --- Makefile.am | 1 + include/vkd3d_shader.h | 5 + libs/vkd3d-shader/dxbc.c | 10 +- libs/vkd3d-shader/dxil.c | 589 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/tpf.c | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 48 +++ libs/vkd3d-shader/vkd3d_shader_private.h | 15 + 7 files changed, 665 insertions(+), 4 deletions(-)

1 0

Conor McCarthy : include: Introduce a function to detect the DXBC source type.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: d3e6a3a78fc25bbdb0ea6de2b6165a1ac5628509 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d3e6a3a78fc25bbdb0ea6de2b6165… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 17 15:15:42 2023 +1000 include: Introduce a function to detect the DXBC source type. --- include/private/vkd3d_shader_utils.h | 63 ++++++++++++++++++++++++++++++++++++ libs/vkd3d/state.c | 10 ++++-- 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_shader_utils.h b/include/private/vkd3d_shader_utils.h new file mode 100644 index 00000000..00052a89 --- /dev/null +++ b/include/private/vkd3d_shader_utils.h @@ -0,0 +1,63 @@ +/* + * Copyright 2023 Conor McCarthy for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_SHADER_UTILS_H +#define __VKD3D_SHADER_UTILS_H + +#include "vkd3d_shader.h" + +#define TAG_DXIL VKD3D_MAKE_TAG('D', 'X', 'I', 'L') +#define TAG_SHDR VKD3D_MAKE_TAG('S', 'H', 'D', 'R') +#define TAG_SHEX VKD3D_MAKE_TAG('S', 'H', 'E', 'X') + +static inline enum vkd3d_result vkd3d_shader_parse_dxbc_source_type(const struct vkd3d_shader_code *dxbc, + enum vkd3d_shader_source_type *type, char **messages) +{ + struct vkd3d_shader_dxbc_desc desc; + enum vkd3d_result ret; + unsigned int i; + + *type = VKD3D_SHADER_SOURCE_NONE; + + if ((ret = vkd3d_shader_parse_dxbc(dxbc, 0, &desc, messages)) < 0) + return ret; + + for (i = 0; i < desc.section_count; ++i) + { + uint32_t tag = desc.sections[i].tag; + if (tag == TAG_SHDR || tag == TAG_SHEX) + { + *type = VKD3D_SHADER_SOURCE_DXBC_TPF; + } + else if (tag == TAG_DXIL) + { + *type = VKD3D_SHADER_SOURCE_DXBC_DXIL; + /* Default to DXIL if both are present. */ + break; + } + } + + vkd3d_shader_free_dxbc(&desc); + + if (*type == VKD3D_SHADER_SOURCE_NONE) + return VKD3D_ERROR_INVALID_SHADER; + + return VKD3D_OK; +} + +#endif /* __VKD3D_SHADER_UTILS_H */ diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5e46b467..2d813824 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -20,6 +20,7 @@ #include "vkd3d_private.h" #include "vkd3d_shaders.h" +#include "vkd3d_shader_utils.h" /* ID3D12RootSignature */ static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) @@ -1978,14 +1979,14 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.next = shader_interface; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; - compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = options; compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; - if ((ret = vkd3d_shader_compile(&compile_info, &spirv, NULL)) < 0) + if ((ret = vkd3d_shader_parse_dxbc_source_type(&compile_info.source, &compile_info.source_type, NULL)) < 0 + || (ret = vkd3d_shader_compile(&compile_info, &spirv, NULL)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); @@ -2008,6 +2009,7 @@ static int vkd3d_scan_dxbc(const struct d3d12_device *device, const D3D12_SHADER struct vkd3d_shader_scan_descriptor_info *descriptor_info) { struct vkd3d_shader_compile_info compile_info; + enum vkd3d_result ret; const struct vkd3d_shader_compile_option options[] = { @@ -2019,13 +2021,15 @@ static int vkd3d_scan_dxbc(const struct d3d12_device *device, const D3D12_SHADER compile_info.next = descriptor_info; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; - compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; compile_info.options = options; compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; + if ((ret = vkd3d_shader_parse_dxbc_source_type(&compile_info.source, &compile_info.source_type, NULL)) < 0) + return ret; + return vkd3d_shader_scan(&compile_info, NULL); }

1 0

Zebediah Figura : tests: Move HLSL tests to a subdirectory.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: 0d2f2e1860e439a14f849cf58857722bd7df6f7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d2f2e1860e439a14f849cf588577… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 23 18:04:52 2023 -0500 tests: Move HLSL tests to a subdirectory. --- Makefile.am | 280 ++++++++++----------- tests/{ => hlsl}/abs.shader_test | 0 tests/{ => hlsl}/all.shader_test | 0 tests/{ => hlsl}/any.shader_test | 0 .../arithmetic-float-uniform.shader_test | 0 tests/{ => hlsl}/arithmetic-float.shader_test | 0 .../{ => hlsl}/arithmetic-int-uniform.shader_test | 0 tests/{ => hlsl}/arithmetic-int.shader_test | 0 tests/{ => hlsl}/arithmetic-uint.shader_test | 0 .../array-dimension.shader_test} | 0 tests/{ => hlsl}/array-index-expr.shader_test | 0 tests/{ => hlsl}/array-parameters.shader_test | 0 .../array-size-expr.shader_test} | 0 tests/{ => hlsl}/asfloat.shader_test | 0 tests/{ => hlsl}/asuint.shader_test | 0 .../attributes.shader_test} | 0 tests/{ => hlsl}/bitwise.shader_test | 0 .../bool-cast.shader_test} | 0 tests/{ => hlsl}/bool-semantics.shader_test | 0 tests/{ => hlsl}/cast-broadcast.shader_test | 0 .../cast-componentwise-compatible.shader_test | 0 .../cast-componentwise-equal.shader_test | 0 tests/{ => hlsl}/cast-to-float.shader_test | 0 tests/{ => hlsl}/cast-to-half.shader_test | 0 tests/{ => hlsl}/cast-to-int.shader_test | 0 tests/{ => hlsl}/cast-to-uint.shader_test | 0 tests/{ => hlsl}/cbuffer.shader_test | 0 .../clamp.shader_test} | 0 .../clip.shader_test} | 0 .../comma.shader_test} | 0 tests/{ => hlsl}/compute.shader_test | 0 tests/{ => hlsl}/conditional.shader_test | 0 .../cross.shader_test} | 0 .../d3dcolor-to-ubyte4.shader_test} | 0 tests/{ => hlsl}/ddxddy.shader_test | 0 .../discard.shader_test} | 0 tests/{ => hlsl}/distance.shader_test | 0 .../{hlsl-dot.shader_test => hlsl/dot.shader_test} | 0 .../duplicate-modifiers.shader_test} | 0 tests/{ => hlsl}/entry-point-semantics.shader_test | 0 tests/{ => hlsl}/exp.shader_test | 0 tests/{ => hlsl}/expr-indexing.shader_test | 0 tests/{ => hlsl}/floor.shader_test | 0 tests/{ => hlsl}/fmod.shader_test | 0 .../{hlsl-for.shader_test => hlsl/for.shader_test} | 0 tests/{ => hlsl}/frac.shader_test | 0 .../function-cast.shader_test} | 0 .../function-overload.shader_test} | 0 tests/{ => hlsl}/function-return.shader_test | 0 .../function.shader_test} | 0 .../gather-offset.shader_test} | 0 .../gather.shader_test} | 0 .../initializer-flatten.shader_test} | 0 .../initializer-implicit-array.shader_test} | 0 .../initializer-invalid-arg-count.shader_test} | 0 .../initializer-local-array.shader_test} | 0 .../initializer-matrix.shader_test} | 0 .../initializer-nested.shader_test} | 0 .../initializer-numeric.shader_test} | 0 .../initializer-objects.shader_test} | 0 .../initializer-static-array.shader_test} | 0 .../initializer-struct.shader_test} | 0 .../intrinsic-override.shader_test} | 0 .../invalid.shader_test} | 0 .../is-front-face.shader_test} | 0 .../ldexp.shader_test} | 0 .../length.shader_test} | 0 .../lerp.shader_test} | 0 tests/{ => hlsl}/lit.shader_test | 0 tests/{ => hlsl}/load-level.shader_test | 0 tests/{ => hlsl}/log.shader_test | 0 tests/{ => hlsl}/logic-operations.shader_test | 0 tests/{ => hlsl}/loop.shader_test | 0 .../majority-pragma.shader_test} | 0 tests/{ => hlsl}/majority-syntax.shader_test | 0 .../majority-typedef.shader_test} | 0 tests/{ => hlsl}/math.shader_test | 0 .../matrix-indexing.shader_test} | 0 tests/{ => hlsl}/matrix-semantics.shader_test | 0 tests/{ => hlsl}/max.shader_test | 0 tests/{ => hlsl}/minimum-precision.shader_test | 0 .../{hlsl-mul.shader_test => hlsl/mul.shader_test} | 0 tests/{ => hlsl}/multiple-rt.shader_test | 0 .../nested-arrays.shader_test} | 0 tests/{ => hlsl}/nointerpolation.shader_test | 0 .../normalize.shader_test} | 0 .../numeric-constructor-truncation.shader_test} | 0 .../numeric-types.shader_test} | 0 .../numthreads.shader_test} | 0 tests/{ => hlsl}/object-field-offsets.shader_test | 0 tests/{ => hlsl}/object-parameters.shader_test | 0 tests/{ => hlsl}/object-references.shader_test | 0 tests/{ => hlsl}/pow.shader_test | 0 tests/{ => hlsl}/reflect.shader_test | 0 tests/{ => hlsl}/register-reservations.shader_test | 0 .../return-implicit-conversion.shader_test} | 0 tests/{ => hlsl}/return.shader_test | 0 tests/{ => hlsl}/round.shader_test | 0 tests/{ => hlsl}/sample-bias.shader_test | 0 tests/{ => hlsl}/sample-grad.shader_test | 0 tests/{ => hlsl}/sample-level.shader_test | 0 tests/{ => hlsl}/sampler-offset.shader_test | 0 tests/{ => hlsl}/sampler.shader_test | 0 tests/{ => hlsl}/saturate.shader_test | 0 .../shader-interstage-interface.shader_test | 0 .../shape.shader_test} | 0 tests/{ => hlsl}/side-effects.shader_test | 0 tests/{ => hlsl}/sign.shader_test | 0 .../single-numeric-initializer.shader_test} | 0 .../smoothstep.shader_test} | 0 tests/{ => hlsl}/sqrt.shader_test | 0 .../state-block-syntax.shader_test} | 0 .../static-initializer.shader_test} | 0 tests/{ => hlsl}/step.shader_test | 0 .../storage-qualifiers.shader_test} | 0 .../struct-array.shader_test} | 0 .../struct-assignment.shader_test} | 0 .../struct-semantics.shader_test} | 0 tests/{ => hlsl}/swizzle-constant-prop.shader_test | 0 tests/{ => hlsl}/swizzles.shader_test | 0 .../ternary.shader_test} | 0 tests/{ => hlsl}/texture-load-offset.shader_test | 0 tests/{ => hlsl}/texture-load-typed.shader_test | 0 tests/{ => hlsl}/texture-load.shader_test | 0 .../transpose.shader_test} | 0 tests/{ => hlsl}/trigonometry.shader_test | 0 .../trunc.shader_test} | 0 .../type-names.shader_test} | 0 tests/{ => hlsl}/uav-load.shader_test | 0 tests/{ => hlsl}/uav-out-param.shader_test | 0 tests/{ => hlsl}/uav-rwbuffer.shader_test | 0 .../{ => hlsl}/uav-rwstructuredbuffer.shader_test | 0 tests/{ => hlsl}/uav-rwtexture.shader_test | 0 .../vector-indexing-uniform.shader_test} | 0 .../vector-indexing.shader_test} | 0 tests/{ => hlsl}/writemask-assignop-0.shader_test | 0 tests/{ => hlsl}/writemask-assignop-1.shader_test | 0 tests/{ => hlsl}/writemask-assignop-2.shader_test | 0 tests/{ => hlsl}/writemask-assignop-3.shader_test | 0 139 files changed, 140 insertions(+), 140 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader: Unify static string arrays initialization pattern.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: 69f32796b02c7c7651eb556cc7b881a5f8d7f1d7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/69f32796b02c7c7651eb556cc7b88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 12 12:29:35 2023 +0200 vkd3d-shader: Unify static string arrays initialization pattern. --- libs/vkd3d-common/debug.c | 10 +++++----- libs/vkd3d-shader/d3d_asm.c | 48 ++++++++++++++++++++++----------------------- libs/vkd3d-shader/hlsl.c | 32 +++++++++++++++--------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index b363efbd..4e4af5f9 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -44,11 +44,11 @@ extern const char *const vkd3d_dbg_env_name; static const char *const debug_level_names[] = { - /* VKD3D_DBG_LEVEL_NONE */ "none", - /* VKD3D_DBG_LEVEL_ERR */ "err", - /* VKD3D_DBG_LEVEL_FIXME */ "fixme", - /* VKD3D_DBG_LEVEL_WARN */ "warn", - /* VKD3D_DBG_LEVEL_TRACE */ "trace", + [VKD3D_DBG_LEVEL_NONE ] = "none", + [VKD3D_DBG_LEVEL_ERR ] = "err", + [VKD3D_DBG_LEVEL_FIXME] = "fixme", + [VKD3D_DBG_LEVEL_WARN ] = "warn", + [VKD3D_DBG_LEVEL_TRACE] = "trace", }; enum vkd3d_dbg_level vkd3d_dbg_get_level(void) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 0a821b5c..d72402eb 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -578,17 +578,17 @@ static void shader_dump_resource_type(struct vkd3d_d3d_asm_compiler *compiler, e { static const char *const resource_type_names[] = { - /* VKD3D_SHADER_RESOURCE_NONE */ "none", - /* VKD3D_SHADER_RESOURCE_BUFFER */ "buffer", - /* VKD3D_SHADER_RESOURCE_TEXTURE_1D */ "texture1d", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2D */ "texture2d", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMS */ "texture2dms", - /* VKD3D_SHADER_RESOURCE_TEXTURE_3D */ "texture3d", - /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBE */ "texturecube", - /* VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ "texture1darray", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ "texture2darray", - /* VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ "texture2dmsarray", - /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", + [VKD3D_SHADER_RESOURCE_NONE ] = "none", + [VKD3D_SHADER_RESOURCE_BUFFER ] = "buffer", + [VKD3D_SHADER_RESOURCE_TEXTURE_1D ] = "texture1d", + [VKD3D_SHADER_RESOURCE_TEXTURE_2D ] = "texture2d", + [VKD3D_SHADER_RESOURCE_TEXTURE_2DMS ] = "texture2dms", + [VKD3D_SHADER_RESOURCE_TEXTURE_3D ] = "texture3d", + [VKD3D_SHADER_RESOURCE_TEXTURE_CUBE ] = "texturecube", + [VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY ] = "texture1darray", + [VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY ] = "texture2darray", + [VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY] = "texture2dmsarray", + [VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY] = "texturecubearray", }; if (type < ARRAY_SIZE(resource_type_names)) @@ -601,19 +601,19 @@ static void shader_dump_data_type(struct vkd3d_d3d_asm_compiler *compiler, const { static const char *const data_type_names[] = { - /* VKD3D_DATA_FLOAT */ "float", - /* VKD3D_DATA_INT */ "int", - /* VKD3D_DATA_RESOURCE */ "resource", - /* VKD3D_DATA_SAMPLER */ "sampler", - /* VKD3D_DATA_UAV */ "uav", - /* VKD3D_DATA_UINT */ "uint", - /* VKD3D_DATA_UNORM */ "unorm", - /* VKD3D_DATA_SNORM */ "snorm", - /* VKD3D_DATA_OPAQUE */ "opaque", - /* VKD3D_DATA_MIXED */ "mixed", - /* VKD3D_DATA_DOUBLE */ "double", - /* VKD3D_DATA_CONTINUED */ "<continued>", - /* VKD3D_DATA_UNUSED */ "<unused>", + [VKD3D_DATA_FLOAT ] = "float", + [VKD3D_DATA_INT ] = "int", + [VKD3D_DATA_RESOURCE ] = "resource", + [VKD3D_DATA_SAMPLER ] = "sampler", + [VKD3D_DATA_UAV ] = "uav", + [VKD3D_DATA_UINT ] = "uint", + [VKD3D_DATA_UNORM ] = "unorm", + [VKD3D_DATA_SNORM ] = "snorm", + [VKD3D_DATA_OPAQUE ] = "opaque", + [VKD3D_DATA_MIXED ] = "mixed", + [VKD3D_DATA_DOUBLE ] = "double", + [VKD3D_DATA_CONTINUED] = "<continued>", + [VKD3D_DATA_UNUSED ] = "<unused>", }; const char *name; int i; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index acc2a89c..3a1e1779 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2124,18 +2124,18 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) { static const char * const names[] = { - "HLSL_IR_CALL", - "HLSL_IR_CONSTANT", - "HLSL_IR_EXPR", - "HLSL_IR_IF", - "HLSL_IR_INDEX", - "HLSL_IR_LOAD", - "HLSL_IR_LOOP", - "HLSL_IR_JUMP", - "HLSL_IR_RESOURCE_LOAD", - "HLSL_IR_RESOURCE_STORE", - "HLSL_IR_STORE", - "HLSL_IR_SWIZZLE", + [HLSL_IR_CALL ] = "HLSL_IR_CALL", + [HLSL_IR_CONSTANT ] = "HLSL_IR_CONSTANT", + [HLSL_IR_EXPR ] = "HLSL_IR_EXPR", + [HLSL_IR_IF ] = "HLSL_IR_IF", + [HLSL_IR_INDEX ] = "HLSL_IR_INDEX", + [HLSL_IR_LOAD ] = "HLSL_IR_LOAD", + [HLSL_IR_LOOP ] = "HLSL_IR_LOOP", + [HLSL_IR_JUMP ] = "HLSL_IR_JUMP", + [HLSL_IR_RESOURCE_LOAD ] = "HLSL_IR_RESOURCE_LOAD", + [HLSL_IR_RESOURCE_STORE] = "HLSL_IR_RESOURCE_STORE", + [HLSL_IR_STORE ] = "HLSL_IR_STORE", + [HLSL_IR_SWIZZLE ] = "HLSL_IR_SWIZZLE", }; if (type >= ARRAY_SIZE(names)) @@ -2147,11 +2147,11 @@ const char *hlsl_jump_type_to_string(enum hlsl_ir_jump_type type) { static const char * const names[] = { - [HLSL_IR_JUMP_BREAK] = "HLSL_IR_JUMP_BREAK", - [HLSL_IR_JUMP_CONTINUE] = "HLSL_IR_JUMP_CONTINUE", + [HLSL_IR_JUMP_BREAK] = "HLSL_IR_JUMP_BREAK", + [HLSL_IR_JUMP_CONTINUE] = "HLSL_IR_JUMP_CONTINUE", [HLSL_IR_JUMP_DISCARD_NEG] = "HLSL_IR_JUMP_DISCARD_NEG", - [HLSL_IR_JUMP_DISCARD_NZ] = "HLSL_IR_JUMP_DISCARD_NZ", - [HLSL_IR_JUMP_RETURN] = "HLSL_IR_JUMP_RETURN", + [HLSL_IR_JUMP_DISCARD_NZ] = "HLSL_IR_JUMP_DISCARD_NZ", + [HLSL_IR_JUMP_RETURN] = "HLSL_IR_JUMP_RETURN", }; assert(type < ARRAY_SIZE(names));

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store the fields of struct parse_if_body as hlsl_block pointers.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: 9ccba35dde7f0474e3a4b5f8f8ed76ce74d7f491 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9ccba35dde7f0474e3a4b5f8f8ed7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 18:30:02 2022 -0600 vkd3d-shader/hlsl: Store the fields of struct parse_if_body as hlsl_block pointers. --- libs/vkd3d-shader/hlsl.y | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d148e85f..60d6514c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -85,8 +85,8 @@ struct parse_function struct parse_if_body { - struct list *then_block; - struct list *else_block; + struct hlsl_block *then_block; + struct hlsl_block *else_block; }; enum parse_assign_op @@ -5811,19 +5811,16 @@ selection_statement: KW_IF '(' expr ')' if_body { struct hlsl_ir_node *condition = node_from_list($3); - struct hlsl_block then_block, else_block; struct hlsl_ir_node *instr; - hlsl_block_init(&then_block); - list_move_tail(&then_block.instrs, $5.then_block); - hlsl_block_init(&else_block); - if ($5.else_block) - list_move_tail(&else_block.instrs, $5.else_block); - vkd3d_free($5.then_block); - vkd3d_free($5.else_block); - - if (!(instr = hlsl_new_if(ctx, condition, &then_block, &else_block, &@1))) + if (!(instr = hlsl_new_if(ctx, condition, $5.then_block, $5.else_block, &@1))) + { + destroy_block($5.then_block); + destroy_block($5.else_block); YYABORT; + } + destroy_block($5.then_block); + destroy_block($5.else_block); if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) { struct vkd3d_string_buffer *string; @@ -5840,13 +5837,13 @@ selection_statement: if_body: statement { - $$.then_block = $1; + $$.then_block = list_to_block($1); $$.else_block = NULL; } | statement KW_ELSE statement { - $$.then_block = $1; - $$.else_block = $3; + $$.then_block = list_to_block($1); + $$.else_block = list_to_block($3); } loop_statement:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store the "instrs" field of struct parse_initializer as a hlsl_block pointer.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: 8fa17502062597d00f032f436e746e9047b3e339 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8fa17502062597d00f032f436e746… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 12 23:04:17 2022 -0600 vkd3d-shader/hlsl: Store the "instrs" field of struct parse_initializer as a hlsl_block pointer. --- libs/vkd3d-shader/hlsl.y | 245 +++++++++++++++++++++++++++-------------------- 1 file changed, 139 insertions(+), 106 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use add_unary_arithmetic_expr() in the subtraction rule.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: 588784e4dcdb53e3a0f6c645f7d5c2e0faf8c091 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/588784e4dcdb53e3a0f6c645f7d5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 20:34:40 2022 -0600 vkd3d-shader/hlsl: Use add_unary_arithmetic_expr() in the subtraction rule. --- libs/vkd3d-shader/hlsl.y | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7efd6a12..59744796 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6184,9 +6184,8 @@ add_expr: { struct hlsl_ir_node *neg; - if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, node_from_list($3), &@2))) + if (!(neg = add_unary_arithmetic_expr(ctx, $3, HLSL_OP1_NEG, node_from_list($3), &@2))) YYABORT; - list_add_tail($3, &neg->entry); $$ = add_binary_expr_merge(ctx, $1, $3, HLSL_OP2_ADD, &@2); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Factor out add_binary_expr_merge().
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: b4bf5af475506cf6821cd95d77d48c706921c0a7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b4bf5af475506cf6821cd95d77d48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 20:31:56 2022 -0600 vkd3d-shader/hlsl: Factor out add_binary_expr_merge(). --- libs/vkd3d-shader/hlsl.y | 141 ++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 76 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Merge the "discard_statement" rule into "jump_statement".
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: vkd3d Branch: master Commit: 7d521db3db5e5904808077ea979b8582741b2835 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d521db3db5e5904808077ea979b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 2 16:23:35 2023 -0500 vkd3d-shader/hlsl: Merge the "discard_statement" rule into "jump_statement". --- libs/vkd3d-shader/hlsl.y | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 59744796..c9da3827 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4431,7 +4431,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> conditional_expr %type <list> declaration %type <list> declaration_statement -%type <list> discard_statement %type <list> equality_expr %type <list> expr %type <list> expr_optional @@ -5741,7 +5740,6 @@ statement: declaration_statement | expr_statement | compound_statement - | discard_statement | jump_statement | selection_statement | loop_statement @@ -5760,9 +5758,7 @@ jump_statement: if (!add_return(ctx, $$, NULL, &@1)) YYABORT; } - -discard_statement: - KW_DISCARD ';' + | KW_DISCARD ';' { struct hlsl_ir_node *discard, *c;

1 0

Mohamad Al-Jaf : twinapi.appcore: Add RegisterAppConstrainedChangeNotification() stub.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: c12e8f6123d1d5c9bd5d5928bd67748f4d12f8e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c12e8f6123d1d5c9bd5d5928bd6774… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu May 18 20:01:21 2023 -0400 twinapi.appcore: Add RegisterAppConstrainedChangeNotification() stub. Needed for Age of Wonders 4. --- dlls/twinapi.appcore/main.c | 9 +++++++++ dlls/twinapi.appcore/twinapi.appcore.spec | 2 +- include/appnotify.h | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/twinapi.appcore/main.c b/dlls/twinapi.appcore/main.c index 99e413f8946..bd8a949d494 100644 --- a/dlls/twinapi.appcore/main.c +++ b/dlls/twinapi.appcore/main.c @@ -21,6 +21,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(twinapi); +/*********************************************************************** + * RegisterAppConstrainedChangeNotification (twinapi.appcore.@) + */ +ULONG WINAPI RegisterAppConstrainedChangeNotification( PAPPCONSTRAIN_CHANGE_ROUTINE routine, void *context, PAPPCONSTRAIN_REGISTRATION *reg ) +{ + FIXME( "routine %p, context %p, reg %p - stub.\n", routine, context, reg ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /*********************************************************************** * RegisterAppStateChangeNotification (twinapi.appcore.@) */ diff --git a/dlls/twinapi.appcore/twinapi.appcore.spec b/dlls/twinapi.appcore/twinapi.appcore.spec index 0b2d8d2055e..c3a0c85f44f 100644 --- a/dlls/twinapi.appcore/twinapi.appcore.spec +++ b/dlls/twinapi.appcore/twinapi.appcore.spec @@ -121,7 +121,7 @@ @ stub PsmUnblockAppStateChangeCompletion @ stub PsmUnregisterAppStateChangeNotification @ stub PsmWaitForAppResume -@ stub RegisterAppConstrainedChangeNotification +@ stdcall RegisterAppConstrainedChangeNotification(ptr ptr ptr) @ stdcall RegisterAppStateChangeNotification(ptr ptr ptr) @ stub UnregisterAppConstrainedChangeNotification @ stdcall UnregisterAppStateChangeNotification(ptr) diff --git a/include/appnotify.h b/include/appnotify.h index 882b0342afb..26e983e6a91 100644 --- a/include/appnotify.h +++ b/include/appnotify.h @@ -36,9 +36,12 @@ extern "C" { #endif typedef void (__cdecl *PAPPSTATE_CHANGE_ROUTINE)(BOOLEAN quiesced, void *context); +typedef void (__cdecl *PAPPCONSTRAIN_CHANGE_ROUTINE)(BOOLEAN constrained, void *context); typedef struct _APPSTATE_REGISTRATION *PAPPSTATE_REGISTRATION; +typedef struct _APPCONSTRAIN_REGISTRATION *PAPPCONSTRAIN_REGISTRATION; +APICONTRACT ULONG NTAPI RegisterAppConstrainedChangeNotification(PAPPCONSTRAIN_CHANGE_ROUTINE,void *,PAPPCONSTRAIN_REGISTRATION *); APICONTRACT ULONG NTAPI RegisterAppStateChangeNotification(PAPPSTATE_CHANGE_ROUTINE,void *,PAPPSTATE_REGISTRATION *); APICONTRACT void NTAPI UnregisterAppStateChangeNotification(PAPPSTATE_REGISTRATION);

1 0