wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Alexandre Julliard : xml2: Import upstream release 2.10.3.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: d0b03aa202ae620bbaa57b04198b89474fe7affc URL: https://gitlab.winehq.org/wine/wine/-/commit/d0b03aa202ae620bbaa57b04198b89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 11:02:46 2022 +0100 xml2: Import upstream release 2.10.3. --- libs/xml2/HTMLparser.c | 27 +---- libs/xml2/SAX2.c | 24 ++-- libs/xml2/entities.c | 55 +++------ libs/xml2/include/win32config.h | 8 +- libs/xml2/parser.c | 249 ++++++++++++++++++++-------------------- libs/xml2/tree.c | 3 +- libs/xml2/xpath.c | 3 +- 7 files changed, 164 insertions(+), 205 deletions(-)

1 0

Alexandre Julliard : lcms2: Import upstream release 2.14.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: fd3017ff5be7bdbc3d116cdf250b30f168509771 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd3017ff5be7bdbc3d116cdf250b30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 10:56:27 2022 +0100 lcms2: Import upstream release 2.14. --- libs/lcms2/include/lcms2.h | 22 ++++- libs/lcms2/include/lcms2_plugin.h | 22 ++++- libs/lcms2/src/cmscnvrt.c | 4 +- libs/lcms2/src/cmserr.c | 44 ++++++++- libs/lcms2/src/cmsgamma.c | 13 ++- libs/lcms2/src/cmsgmt.c | 11 ++- libs/lcms2/src/cmshalf.c | 2 +- libs/lcms2/src/cmsio0.c | 153 ++++++++++++++++++++++++++---- libs/lcms2/src/cmsio1.c | 5 +- libs/lcms2/src/cmslut.c | 2 +- libs/lcms2/src/cmsnamed.c | 6 +- libs/lcms2/src/cmsopt.c | 4 +- libs/lcms2/src/cmspack.c | 27 +++++- libs/lcms2/src/cmspcs.c | 14 ++- libs/lcms2/src/cmsplugin.c | 76 +++++++++------ libs/lcms2/src/cmssamp.c | 8 +- libs/lcms2/src/cmstypes.c | 193 +++++++++++++++++++++++++++----------- libs/lcms2/src/cmsvirt.c | 31 +++--- libs/lcms2/src/cmsxform.c | 79 +++++++++++++++- libs/lcms2/src/lcms2_internal.h | 81 ++++++++++------ 20 files changed, 617 insertions(+), 180 deletions(-)

1 0

Alexandre Julliard : zlib: Import upstream release 1.2.13.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: cfe8ee571dcd4c04737240ac985717c9f376b488 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfe8ee571dcd4c04737240ac985717… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 10:50:33 2022 +0100 zlib: Import upstream release 1.2.13. --- libs/zlib/LICENSE | 9 +-- libs/zlib/crc32.c | 33 +++++--- libs/zlib/deflate.c | 218 ++++++++++++++++++++++++++------------------------- libs/zlib/deflate.h | 4 +- libs/zlib/inflate.c | 7 +- libs/zlib/inftrees.c | 4 +- libs/zlib/inftrees.h | 2 +- libs/zlib/trees.c | 123 ++++++++++++++--------------- libs/zlib/zconf.h | 19 ++++- libs/zlib/zlib.h | 20 ++--- libs/zlib/zutil.c | 16 ++-- libs/zlib/zutil.h | 1 + 12 files changed, 241 insertions(+), 215 deletions(-)

1 0

Alexandre Julliard : png: Import upstream release 1.6.38.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: d4ce1fd764be3bf03ce3f6332b0d0327725b3ffc URL: https://gitlab.winehq.org/wine/wine/-/commit/d4ce1fd764be3bf03ce3f6332b0d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 10:46:59 2022 +0100 png: Import upstream release 1.6.38. --- libs/png/AUTHORS | 8 +++++-- libs/png/LICENSE | 4 ++-- libs/png/png.c | 14 +++++------ libs/png/png.h | 26 ++++++++++----------- libs/png/pngconf.h | 8 +++---- libs/png/pngget.c | 14 +++++------ libs/png/pngpriv.h | 65 ++++++++++++++++++++++------------------------------ libs/png/pngread.c | 3 --- libs/png/pngrtran.c | 2 +- libs/png/pngrutil.c | 36 ++++++++++++++--------------- libs/png/pngset.c | 13 +++++++---- libs/png/pngstruct.h | 12 +--------- libs/png/pngwrite.c | 12 +++++++++- 13 files changed, 106 insertions(+), 111 deletions(-)

1 0

Alexandre Julliard : faudio: Import upstream release 22.11.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 927f0530f4b87ad1e1c0363b1a3d7438588d6fad URL: https://gitlab.winehq.org/wine/wine/-/commit/927f0530f4b87ad1e1c0363b1a3d74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 09:44:18 2022 +0100 faudio: Import upstream release 22.11. --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT.c | 1 - libs/faudio/src/FAudio.c | 27 +++++++++++++++++---------- libs/faudio/src/FAudioFX_reverb.c | 2 ++ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 88d5e996cbf..565e0b14067 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 22 -#define FAUDIO_MINOR_VERSION 8 +#define FAUDIO_MINOR_VERSION 11 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FACT.c b/libs/faudio/src/FACT.c index f7b3a64bb8e..649abf2111c 100644 --- a/libs/faudio/src/FACT.c +++ b/libs/faudio/src/FACT.c @@ -2409,7 +2409,6 @@ uint32_t FACTCue_Destroy(FACTCue *pCue) { FACTCue *cue, *prev; FAudioMutex mutex; - FACTNotification note; if (pCue == NULL) { return 1; diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c index be3b038185f..559837c410b 100644 --- a/libs/faudio/src/FAudio.c +++ b/libs/faudio/src/FAudio.c @@ -678,16 +678,27 @@ uint32_t FAudio_CreateMasteringVoice( uint32_t DeviceIndex, const FAudioEffectChain *pEffectChain ) { - FAudioDeviceDetails details; - LOG_API_ENTER(audio) /* For now we only support one allocated master voice at a time */ FAudio_assert(audio->master == NULL); - if (FAudio_GetDeviceDetails(audio, DeviceIndex, &details) != 0) + if ( InputChannels == FAUDIO_DEFAULT_CHANNELS || + InputSampleRate == FAUDIO_DEFAULT_SAMPLERATE ) { - return FAUDIO_E_INVALID_CALL; + FAudioDeviceDetails details; + if (FAudio_GetDeviceDetails(audio, DeviceIndex, &details) != 0) + { + return FAUDIO_E_INVALID_CALL; + } + if (InputChannels == FAUDIO_DEFAULT_CHANNELS) + { + InputChannels = details.OutputFormat.Format.nChannels; + } + if (InputSampleRate == FAUDIO_DEFAULT_SAMPLERATE) + { + InputSampleRate = details.OutputFormat.Format.nSamplesPerSec; + } } *ppMasteringVoice = (FAudioMasteringVoice*) audio->pMalloc(sizeof(FAudioVoice)); @@ -704,12 +715,8 @@ uint32_t FAudio_CreateMasteringVoice( (*ppMasteringVoice)->volume = 1.0f; /* Master Properties */ - (*ppMasteringVoice)->master.inputChannels = (InputChannels == FAUDIO_DEFAULT_CHANNELS) ? - details.OutputFormat.Format.nChannels : - InputChannels; - (*ppMasteringVoice)->master.inputSampleRate = (InputSampleRate == FAUDIO_DEFAULT_SAMPLERATE) ? - details.OutputFormat.Format.nSamplesPerSec : - InputSampleRate; + (*ppMasteringVoice)->master.inputChannels = InputChannels; + (*ppMasteringVoice)->master.inputSampleRate = InputSampleRate; /* Sends/Effects */ FAudio_zero(&(*ppMasteringVoice)->sends, sizeof(FAudioVoiceSends)); diff --git a/libs/faudio/src/FAudioFX_reverb.c b/libs/faudio/src/FAudioFX_reverb.c index b357b772ec6..48f55f49fba 100644 --- a/libs/faudio/src/FAudioFX_reverb.c +++ b/libs/faudio/src/FAudioFX_reverb.c @@ -130,11 +130,13 @@ static inline float DspDelay_Process(DspDelay *filter, float sample_in) return delay_out; } +/* FIXME: This is currently unused! What was it for...? -flibit static inline float DspDelay_Tap(DspDelay *filter, uint32_t delay) { FAudio_assert(delay <= filter->delay); return filter->buffer[(filter->write_idx - delay + filter->capacity) % filter->capacity]; } +*/ static inline void DspDelay_Reset(DspDelay *filter) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 dcl_thread_group instructions.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 3857ca06facc3313e6a107cbd6a9df58a25b118d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3857ca06facc3313e6a107cbd6a9d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 17:49:09 2021 -0500 vkd3d-shader/hlsl: Write SM4 dcl_thread_group instructions. --- libs/vkd3d-shader/hlsl.c | 7 ------- libs/vkd3d-shader/hlsl_sm4.c | 18 +++++++++++++++++- tests/compute.shader_test | 6 +++--- tests/hlsl-numthreads.shader_test | 28 ++++++++++++++-------------- tests/uav-load.shader_test | 4 ++-- 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 310560b2..eddbf2c8 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2587,13 +2587,6 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } - if (profile->type == VKD3D_SHADER_TYPE_COMPUTE) - { - const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; - - hlsl_fixme(&ctx, &loc, "Compute shader thread count.\n"); - } - ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); hlsl_ctx_cleanup(&ctx); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index d3e1cbfa..ae5bb1ac 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -833,7 +833,7 @@ struct sm4_instruction } srcs[4]; unsigned int src_count; - uint32_t idx[2]; + uint32_t idx[3]; unsigned int idx_count; }; @@ -1278,6 +1278,19 @@ static void write_sm4_dcl_temps(struct vkd3d_bytecode_buffer *buffer, uint32_t t write_sm4_instruction(buffer, &instr); } +static void write_sm4_dcl_thread_group(struct vkd3d_bytecode_buffer *buffer, const uint32_t thread_count[3]) +{ + struct sm4_instruction instr = + { + .opcode = VKD3D_SM5_OP_DCL_THREAD_GROUP, + + .idx = {thread_count[0], thread_count[1], thread_count[2]}, + .idx_count = 3, + }; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) { struct sm4_instruction instr = @@ -2370,6 +2383,9 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, write_sm4_dcl_semantic(ctx, &buffer, var); } + if (profile->type == VKD3D_SHADER_TYPE_COMPUTE) + write_sm4_dcl_thread_group(&buffer, ctx->thread_count); + if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); diff --git a/tests/compute.shader_test b/tests/compute.shader_test index f5f5920f..6d2f698c 100644 --- a/tests/compute.shader_test +++ b/tests/compute.shader_test @@ -7,7 +7,7 @@ size (1, 1) 0.1 -[compute shader todo] +[compute shader] RWTexture2D<float> u; [numthreads(1, 1, 1)] @@ -17,5 +17,5 @@ void main() } [test] -todo dispatch 1 1 1 -todo probe uav 0 (0, 0) r (-123.0) +dispatch 1 1 1 +probe uav 0 (0, 0) r (-123.0) diff --git a/tests/hlsl-numthreads.shader_test b/tests/hlsl-numthreads.shader_test index 3e3973b3..328be664 100644 --- a/tests/hlsl-numthreads.shader_test +++ b/tests/hlsl-numthreads.shader_test @@ -3,37 +3,37 @@ [require] shader model >= 5.0 -[compute shader todo] +[compute shader] [numthreads(1, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 1, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(0, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 0, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(1, 1, 0)] void main() {} @@ -68,12 +68,12 @@ void main() {} [numthreads(int(1), 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(float(1), 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] [numthreads(uint1(1), 1, 1)] void main() {} @@ -99,30 +99,30 @@ static int x = 1; [numthreads(x, 1, 1)] void main() {} -[compute shader fail todo] +[compute shader fail] void main() {} -[compute shader fail todo] +[compute shader fail] [NumThreads(1, 1, 1)] void main() {} -[compute shader todo] +[compute shader] [numthreads(1, 1, 1)] void main(); void main() {} -[compute shader fail todo] +[compute shader fail] void main() {} [numthreads(1, 1, 1)] void main(); -[compute shader fail todo] +[compute shader fail] void main(); diff --git a/tests/uav-load.shader_test b/tests/uav-load.shader_test index 0f622f2b..fe6350e0 100644 --- a/tests/uav-load.shader_test +++ b/tests/uav-load.shader_test @@ -13,7 +13,7 @@ size (1, 1) 0.5 -[compute shader todo] +[compute shader] RWTexture2D<float> u, v; [numthreads(1, 1, 1)] void main() @@ -23,7 +23,7 @@ void main() } [test] -todo dispatch 1 1 1 +dispatch 1 1 1 probe uav 0 (0, 0) r (0.6) probe uav 0 (1, 0) r (0.6) probe uav 0 (2, 0) r (0.6)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the numthreads attribute.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 718c79b82331ad09c9407969134c3c5a6944c7d8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/718c79b82331ad09c9407969134c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 17:29:34 2021 -0500 vkd3d-shader/hlsl: Parse the numthreads attribute. --- libs/vkd3d-shader/hlsl.h | 3 ++ libs/vkd3d-shader/hlsl_codegen.c | 68 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c7a19302..b6a593ca 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -537,7 +537,10 @@ struct hlsl_ctx } constant_defs; uint32_t temp_count; + uint32_t thread_count[3]; + uint32_t in_state_block : 1; + uint32_t found_numthreads : 1; }; enum hlsl_error_level diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0df870cc..27af49cf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2534,9 +2534,58 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere return ret; } +static void parse_numthreads_attribute(struct hlsl_ctx *ctx, const struct hlsl_attribute *attr) +{ + unsigned int i; + + ctx->found_numthreads = 1; + + if (attr->args_count != 3) + { + hlsl_error(ctx, &attr->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected 3 parameters for [numthreads] attribute, but got %u.", attr->args_count); + return; + } + + for (i = 0; i < attr->args_count; ++i) + { + const struct hlsl_ir_node *instr = attr->args[i].node; + const struct hlsl_type *type = instr->data_type; + const struct hlsl_ir_constant *constant; + + if (type->type != HLSL_CLASS_SCALAR + || (type->base_type != HLSL_TYPE_INT && type->base_type != HLSL_TYPE_UINT)) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument %u of [numthreads]: expected int or uint, but got %s.", + i, string->buffer); + hlsl_release_string_buffer(ctx, string); + break; + } + + if (instr->type != HLSL_IR_CONSTANT) + { + hlsl_fixme(ctx, &instr->loc, "Non-constant expression in [numthreads] initializer."); + break; + } + constant = hlsl_ir_constant(instr); + + if ((type->base_type == HLSL_TYPE_INT && constant->value[0].i <= 0) + || (type->base_type == HLSL_TYPE_UINT && !constant->value[0].u)) + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT, + "Thread count must be a positive integer."); + + ctx->thread_count[i] = constant->value[0].u; + } +} + int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { + const struct hlsl_profile_info *profile = ctx->profile; struct hlsl_block *const body = &entry_func->body; struct hlsl_ir_var *var; unsigned int i; @@ -2578,8 +2627,19 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } for (i = 0; i < entry_func->attr_count; ++i) - hlsl_warning(ctx, &entry_func->attrs[i]->loc, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, - "Ignoring unknown attribute \"%s\".", entry_func->attrs[i]->name); + { + const struct hlsl_attribute *attr = entry_func->attrs[i]; + + if (!strcmp(attr->name, "numthreads") && profile->type == VKD3D_SHADER_TYPE_COMPUTE) + parse_numthreads_attribute(ctx, attr); + else + hlsl_warning(ctx, &entry_func->attrs[i]->loc, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, + "Ignoring unknown attribute \"%s\".", entry_func->attrs[i]->name); + } + + if (profile->type == VKD3D_SHADER_TYPE_COMPUTE && !ctx->found_numthreads) + hlsl_error(ctx, &entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE, + "Entry point \"%s\" is missing a [numthreads] attribute.", entry_func->func->name); transform_ir(ctx, lower_broadcasts, body, NULL); while (transform_ir(ctx, fold_redundant_casts, body, NULL)); @@ -2606,7 +2666,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); - if (ctx->profile->major_version < 4) + if (profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); transform_ir(ctx, validate_static_object_references, body, NULL); @@ -2625,7 +2685,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry rb_for_each_entry(&ctx->functions, dump_function, ctx); allocate_temp_registers(ctx, entry_func); - if (ctx->profile->major_version < 4) + if (profile->major_version < 4) { allocate_const_registers(ctx, entry_func); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index aae7cea1..74edf049 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -119,6 +119,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE = 5020, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO = 5021, VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF = 5022, + VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT = 5023, + VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE = 5024, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse function attributes.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: d6799bd5d3dd356def6a514253c3db5de413e3bb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6799bd5d3dd356def6a514253c3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 14:52:10 2021 -0500 vkd3d-shader/hlsl: Parse function attributes. --- libs/vkd3d-shader/hlsl.c | 33 ++++++++++-- libs/vkd3d-shader/hlsl.h | 14 ++++- libs/vkd3d-shader/hlsl.y | 88 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/hlsl_codegen.c | 5 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl-attributes.shader_test | 22 ++++---- tests/hlsl-numthreads.shader_test | 36 ++++++------- 7 files changed, 164 insertions(+), 35 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use hlsl_new_synthetic_var() in hlsl_new_func_decl().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: da56f41cebb2a8476bde085670c306d6e1fa10aa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da56f41cebb2a8476bde085670c30… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 30 17:46:38 2022 -0500 vkd3d-shader/hlsl: Use hlsl_new_synthetic_var() in hlsl_new_func_decl(). --- libs/vkd3d-shader/hlsl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3f80fcf2..11cb2e7e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1193,17 +1193,12 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl if (!hlsl_types_are_equal(return_type, ctx->builtin_types.Void)) { - struct hlsl_ir_var *return_var; - char name[28]; - - sprintf(name, "<retval-%p>", decl); - if (!(return_var = hlsl_new_var(ctx, hlsl_strdup(ctx, name), return_type, loc, semantic, 0, NULL))) + if (!(decl->return_var = hlsl_new_synthetic_var(ctx, "retval", return_type, &loc))) { vkd3d_free(decl); return NULL; } - list_add_tail(&ctx->globals->vars, &return_var->scope_entry); - decl->return_var = return_var; + decl->return_var->semantic = *semantic; } return decl;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Add a hlsl_fixme() for compute shader thread counts.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 1019bbead607491fa86b674cd3d96355ba214411 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1019bbead607491fa86b674cd3d96… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 14:37:52 2021 -0500 vkd3d-shader/hlsl: Add a hlsl_fixme() for compute shader thread counts. In particular so that we don't cause test crashes by outputting invalid compute shaders. --- libs/vkd3d-shader/hlsl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1f35b1ac..3f80fcf2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2565,6 +2565,13 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } + if (profile->type == VKD3D_SHADER_TYPE_COMPUTE) + { + const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; + + hlsl_fixme(&ctx, &loc, "Compute shader thread count.\n"); + } + ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); hlsl_ctx_cleanup(&ctx);

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 November 2022