[PATCH 0/5] MR298: Draft: Release 1.8.1.
Release for 1.8.1 containing targeted fixes for issues uncovered by Wine tests, in particular an assert which is currently preventing Wine tests from running with 1.8. There were other "safe fix" patches I noticed after 1.8, but on the precedent of 1.7.1 I didn't pick any of them. I've marked this as a draft since it's supposed to be a merge request into a vkd3d-1.8.x branch, but that doesn't currently exist, and it'll need Alexandre to create it as I understand. In the meantime I'm submitting the patches so they can be reviewed. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298
From: Zebediah Figura <zfigura(a)codeweavers.com> Instead of asserting. (cherry picked from commit 1bd873fb2b887d6b4a21d0f009374ddf7cff8303) --- libs/vkd3d-shader/d3dbc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 712613ac..38a32dea 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1693,7 +1693,12 @@ static void write_sm1_sampler_dcls(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b if (var->objects_usage[HLSL_REGSET_SAMPLERS][i].used) { sampler_dim = var->objects_usage[HLSL_REGSET_SAMPLERS][i].sampler_dim; - assert(sampler_dim != HLSL_SAMPLER_DIM_GENERIC); + if (sampler_dim == HLSL_SAMPLER_DIM_GENERIC) + { + /* These can appear in sm4-style combined sample instructions. */ + hlsl_fixme(ctx, &var->loc, "Generic samplers need to be lowered."); + continue; + } reg_id = var->regs[HLSL_REGSET_SAMPLERS].id + i; write_sm1_sampler_dcl(ctx, buffer, reg_id, sampler_dim); -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298
From: Zebediah Figura <zfigura(a)codeweavers.com> (cherry picked from commit 6e370777b484237f94800ec95c7b241755697b33) --- libs/vkd3d-shader/d3dbc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 38a32dea..9a327fee 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2086,5 +2086,9 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun out->code = buffer.data; out->size = buffer.size; } + else + { + vkd3d_free(buffer.data); + } return ret; } -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298
From: Zebediah Figura <zfigura(a)codeweavers.com> (cherry picked from commit 71afb78126488008f64716ae1df41910a8c5a2ef) --- libs/vkd3d-shader/d3dbc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 9a327fee..0e03f43b 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2068,7 +2068,6 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct vkd3d_bytecode_buffer buffer = {0}; - int ret; put_u32(&buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version)); @@ -2081,7 +2080,10 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun put_u32(&buffer, D3DSIO_END); - if (!(ret = buffer.status)) + if (buffer.status) + ctx->result = buffer.status; + + if (!ctx->result) { out->code = buffer.data; out->size = buffer.size; @@ -2090,5 +2092,5 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun { vkd3d_free(buffer.data); } - return ret; + return ctx->result; } -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298
From: Zebediah Figura <zfigura(a)codeweavers.com> Spotted by Francisco Casas. (cherry picked from commit 44bf5556ae00f7d82093a8302aa8597f1b350b4d) --- libs/vkd3d-shader/hlsl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ba5bcfbf..535cf377 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3283,6 +3283,8 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) vkd3d_free((void *)buffer->name); vkd3d_free(buffer); } + + vkd3d_free(ctx->constant_defs.regs); } int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298
From: Zebediah Figura <zfigura(a)codeweavers.com> --- ANNOUNCE | 87 ++++++++++------------------------------------------ configure.ac | 2 +- 2 files changed, 17 insertions(+), 72 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 86d654d2..e825aaa6 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,12 +1,8 @@ -The Wine team is proud to announce that release 1.8 of vkd3d, the Direct3D to +The Wine team is proud to announce that release 1.8.1 of vkd3d, the Direct3D to Vulkan translation library, is now available. -This release contains improvements that are listed in the release notes below. -The main highlights are: - - - Support for still many more HLSL features and intrinsics. - - Performance improvements to vkd3d descriptor updates. - - Miscellaneous bug fixes. +This is a bugfix release, only containing targeted fixes for a couple +of defects that had slipped in in vkd3d 1.8. The source is available from the following location: @@ -21,73 +17,22 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.8 -======================= - - -*** libvkd3d - -- Performance improvements have been made to the code that handles descriptor - updates. In some applications the improvement can be quite significant. - -- Host-visible descriptor heaps are persistently mapped on creation. Some - applications access resource data from the CPU after calling Unmap(), and - that's supposed to work in practice. - -- 1-dimensional texture unordered-access views and shader resource views are - implemented. - -- Shader resource view, unordered access view, and constant buffer view root - descriptors with NULL GPU addresses are supported. - -- Direct3D 12 descriptor heap destruction is delayed until all contained - resources are destroyed. +What's new in vkd3d 1.8.1 +========================= *** libvkd3d-shader -- New features for the HLSL source type: - - Support for the ternary conditional operator "?:". - - Support for "discard" statements. - - Support for the "packoffset" keyword. - - Support for semantics on array types. - - Support for RWBuffer loads and stores. - - Register allocation for arrays and structures of resources and samplers - is implemented. - - Support for the SV_IsFrontFace pixel shader system-value semantics. - - Support for using constant expressions as array sizes and indices. - - Support for dynamic selection of vector components. - - Support for the following intrinsic functions: - - D3DCOLORtoUBYTE4() - - any() - - asfloat() - - ddx() and ddy() - - fmod() - - log(), log2(), and log10() - - sign() - - trunc() - - The SampleBias(), SampleCmp(), SampleCmpLevelZero(), and SampleGrad() - texture object methods are implemented. - - Support for the case-insensitive variants of the "vector" and "matrix" - data types. - - Parser support for the "unroll" loop attribute. A warning is output for - "unroll" without iteration count, and an error is output when an iteration - count is specified. Actual unrolling is not implemented yet. - - Parser support for RWStructuredBuffer resources. - - Parser support for SamplerComparisonState objects. Note that outputting - compiled effects is not supported yet, but parsing these allows shaders - containing SamplerComparisonState state objects to be compiled. - -- More improvements to HLSL support for the Direct3D shader model 1/2/3 - profiles. - -- The section alignment of DXBC blobs produced by - vkd3d_shader_serialize_dxbc() matches those produced by d3dcompiler more - closely. +- Previous releases included support for compiling HLSL to legacy Direct3D + bytecode. In certain cases vkd3d-shader would report that compilation had + failed due to an unimplemented feature through shader messages, but at the + same time return VKD3D_OK and an incorrect shader binary. These cases are + fixed in vkd3d 1.8.1. -- The "main" function for shaders produced by the SPIR-V target is always - terminated, even when the source was a TPF shader without explicit "ret" - instruction. +- In previous releases, when compiling from HLSL to legacy Direct3D bytecode, + using .Sample() and similar methods would fail due to the feature not yet + being implemented. In vkd3d 1.8, this instead triggers an internal assertion. + This is fixed in vkd3d 1.8.1; the feature is still not implemented, but + compilation once again fails gracefully. -- Relative addressing of shader input registers is supported by SPIR-V - targets. +- Some memory leaks related to HLSL compilation are fixed in vkd3d 1.8.1. diff --git a/configure.ac b/configure.ac index f9039158..20c9d2b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.8]) +AC_INIT([vkd3d],[1.8.1]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298
I'm probably missing something here, but don't we need 06040d2a3034eafbe839951f77b6a7abda32f7ce as well? -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298#note_41437
I'm probably missing something here, but don't we need 06040d2a3034eafbe839951f77b6a7abda32f7ce as well?
I thought about it, but I'm not sure. On the one hand, it is a regression by the books. On the other, I think it's a little less than perfectly meaningful, since the pre-regression behaviour was a "not implemented" failure, and this new failure is not exactly ill-defined. The fix is also a bit more risky than the others here for a stable release, and it only ends up fixing a test todo anyway. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298#note_41466
We'll want to update the download URL as well. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/298#note_41532
participants (4)
-
Henri Verbeet (＠hverbeet) -
Huw Davies (＠huw)
-
Zebediah Figura
-
Zebediah Figura (＠zfigura)