[PATCH 0/7] MR244: Release 1.8.
This series includes !236 and !243, mostly to avoid any potential ambiguity around their order relative to the release commit. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
From: Francisco Casas <fcasas(a)codeweavers.com> In SM1 we can expect all variables to always belong to a single regset. structs in particular, should always be allocated to HLSL_REGSET_NUM, since they are only allowed if all their components are numeric. We are not covering the structs case because of the use of hlsl_type_get_regset(), which is currently not defined for structs. So the current shader struct { float4 a; float4 b; } apple; float4 main() : sv_target { return apple.a + apple.b; } fails with vkd3d/libs/vkd3d-shader/hlsl.c:224: Aborting, reached unreachable code. The solution is to iterate over all regsets to find the one where the variable is allocated (if any), and ignore all others. --- libs/vkd3d-shader/d3dbc.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index c35f8ca0f..712613ac1 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1281,10 +1281,13 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { + if (var->semantic.name || !var->regs[r].allocated) + continue; + ++uniform_count; if (var->is_param && var->is_uniform) @@ -1321,20 +1324,23 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { + if (var->semantic.name || !var->regs[r].allocated) + continue; + put_u32(buffer, 0); /* name */ - if (regset == HLSL_REGSET_NUMERIC) + if (r == HLSL_REGSET_NUMERIC) { - put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->regs[regset].id)); - put_u32(buffer, var->data_type->reg_size[regset] / 4); + put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->regs[r].id)); + put_u32(buffer, var->data_type->reg_size[r] / 4); } else { - put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[regset].id)); - put_u32(buffer, var->regs[regset].bind_count); + put_u32(buffer, vkd3d_make_u32(D3DXRS_SAMPLER, var->regs[r].id)); + put_u32(buffer, var->regs[r].bind_count); } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ @@ -1345,12 +1351,16 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - enum hlsl_regset regset = hlsl_type_get_regset(var->data_type); + unsigned int r; - if (!var->semantic.name && var->regs[regset].allocated) + for (r = 0; r <= HLSL_REGSET_LAST; ++r) { - size_t var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); - size_t name_offset; + size_t var_offset, name_offset; + + if (var->semantic.name || !var->regs[r].allocated) + continue; + + var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); name_offset = put_string(buffer, var->name); set_u32(buffer, var_offset, name_offset - ctab_start); -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/register-reservations.shader_test | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index 72f68c1e0..f5b3da172 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -69,6 +69,36 @@ draw quad probe all rgba (1.0, 1.0, 1.0, 99.0) +% Register reservation with incorrect register type. +[pixel shader todo] +Texture2D unused : register(s0); +Texture2D tex; + +float4 main() : sv_target +{ + return tex.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (0.0, 0.0, 0.0, 99.0) + + +% Register reservation with incorrect register type. +[pixel shader todo] +sampler2D unused : register(t0); +Texture2D tex; + +float4 main() : sv_target +{ + return tex.Load(int3(0, 0, 0)); +} + + +[test] +todo draw quad +probe all rgba (0.0, 0.0, 0.0, 99.0) + [pixel shader] Texture2D unused[2][2] : register(t0); Texture2D tex; @@ -81,3 +111,34 @@ float4 main() : sv_target [test] draw quad probe all rgba (4.0, 4.0, 4.0, 99.0) + + +% Overlapping reservations, both overlapping objects are unused. +[pixel shader todo] +Texture2D tex1 : register(t0); +Texture2D tex2 : register(t0); +Texture2D tex3; + +float4 main() : sv_target +{ + return tex3.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (1.0, 1.0, 1.0, 99.0) + + +% Overlapping reservations +[pixel shader todo] +Texture2D tex1 : register(t2); +Texture2D tex2 : register(t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 99.0) -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
From: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 96b4cb660..36b66982f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3626,11 +3626,23 @@ static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) { - if (!var->regs[regset].allocated) + if (var->reg_reservation.reg_type == get_regset_name(regset) + && var->data_type->reg_size[regset]) + { + /* Vars with a reservation prevent non-reserved vars from being + * bound there even if the reserved vars aren't used. */ + start = var->reg_reservation.reg_index; + count = var->data_type->reg_size[regset]; + } + else if (var->regs[regset].allocated) + { + start = var->regs[regset].id; + count = var->regs[regset].bind_count; + } + else + { continue; - - start = var->regs[regset].id; - count = var->regs[regset].bind_count; + } if (start <= index && index < start + count) return var; -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
From: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 7 +++---- tests/register-reservations.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 36b66982f..37afdc2db 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2710,11 +2710,10 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) type_string->buffer, get_regset_name(regset)); hlsl_release_string_buffer(ctx, type_string); } - else + else if (var->regs[regset].bind_count) { var->regs[regset].allocated = true; var->regs[regset].id = var->reg_reservation.reg_index; - var->regs[regset].bind_count = var->data_type->reg_size[regset]; TRACE("Allocated reserved %s to %c%u-%c%u.\n", var->name, var->reg_reservation.reg_type, var->reg_reservation.reg_index, var->reg_reservation.reg_type, var->reg_reservation.reg_index + var->regs[regset].bind_count); @@ -4124,10 +4123,10 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry if (TRACE_ON()) rb_for_each_entry(&ctx->functions, dump_function, ctx); - allocate_register_reservations(ctx); - calculate_resource_register_counts(ctx); + allocate_register_reservations(ctx); + allocate_temp_registers(ctx, entry_func); if (profile->major_version < 4) { diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index f5b3da172..23d4ae5cd 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -114,7 +114,7 @@ probe all rgba (4.0, 4.0, 4.0, 99.0) % Overlapping reservations, both overlapping objects are unused. -[pixel shader todo] +[pixel shader] Texture2D tex1 : register(t0); Texture2D tex2 : register(t0); Texture2D tex3; @@ -125,12 +125,12 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 1.0, 1.0, 99.0) % Overlapping reservations -[pixel shader todo] +[pixel shader] Texture2D tex1 : register(t2); Texture2D tex2 : register(t2); @@ -140,5 +140,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 99.0) -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- tests/register-reservations.shader_test | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 37afdc2db..765b19074 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2698,7 +2698,7 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) continue; regset = hlsl_type_get_regset(var->data_type); - if (var->reg_reservation.reg_type) + if (var->reg_reservation.reg_type && var->regs[regset].bind_count) { if (var->reg_reservation.reg_type != get_regset_name(regset)) { @@ -2710,7 +2710,7 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) type_string->buffer, get_regset_name(regset)); hlsl_release_string_buffer(ctx, type_string); } - else if (var->regs[regset].bind_count) + else { var->regs[regset].allocated = true; var->regs[regset].id = var->reg_reservation.reg_index; diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index 23d4ae5cd..26f4381d0 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -70,7 +70,7 @@ probe all rgba (1.0, 1.0, 1.0, 99.0) % Register reservation with incorrect register type. -[pixel shader todo] +[pixel shader] Texture2D unused : register(s0); Texture2D tex; @@ -80,12 +80,12 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 99.0) % Register reservation with incorrect register type. -[pixel shader todo] +[pixel shader] sampler2D unused : register(t0); Texture2D tex; @@ -96,7 +96,7 @@ float4 main() : sv_target [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 99.0) [pixel shader] -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 92c6d0792..db67423b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,8 +146,8 @@ vkd3d_shader_tests = \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/object-field-offsets.shader_test \ - tests/object-references.shader_test \ tests/object-parameters.shader_test \ + tests/object-references.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- ANNOUNCE | 113 +++++++++++++++++----------- AUTHORS | 2 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 83 insertions(+), 56 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index abc46f451..86d654d27 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,17 +1,16 @@ -The Wine team is proud to announce that release 1.7 of vkd3d, the Direct3D to +The Wine team is proud to announce that release 1.8 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 many more HLSL features and intrinsics. - - Much improved support for the Direct3D shader model 1/2/3 HLSL profiles. - - Public vkd3d-shader API for parsing and serialising DXBC blobs. + - Support for still many more HLSL features and intrinsics. + - Performance improvements to vkd3d descriptor updates. - Miscellaneous bug fixes. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.7.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.8.tar.xz The current source can also be pulled directly from the git repository: @@ -22,49 +21,73 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.7 +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. + + *** libvkd3d-shader - New features for the HLSL source type: - - Support for calling user-defined functions. - - Support for array parameters to user-defined functions. - - Much improved support for the Direct3D shader model 1/2/3 profiles. - - Support for the SV_DispatchThreadID, SV_GroupID, and SV_GroupThreadID - compute shader system-value semantics. - - Support for the optional "offset" parameter of the texture object Load() - method. - - Support for the all() intrinsic function. - - Support for the distance() intrinsic function. - - Support for the exp() and exp2() intrinsic functions. - - Support for the frac() intrinsic function. - - Support for the lit() intrinsic function. - - Support for the reflect() intrinsic function. - - Support for the sin() and cos() intrinsic functions. - - Support for the smoothstep() intrinsic function. - - Support for the sqrt() and rsqrt() intrinsic functions. - - Support for the step() intrinsic function. - - Support for the transpose() intrinsic function. - - Support for the case-insensitive variants of the "float" and "dword" data - types. - - Partial support for minimum precision data types like "min16float". These - are currently interpreted as their regular counterparts. - - Improved constant propagation support, in particular to constant - propagation through swizzles. - -- HLSL static variables are now properly zero-initialised. - -- The Direct3D shader model 4 and 5 disassembler outputs sample counts for - multi-sampled resource declarations. - -- New interfaces: - - vkd3d_shader_parse_dxbc() provides support for parsing DXBC blobs. - - vkd3d_shader_serialize_dxbc() provides support for serialising DXBC blobs. - - vkd3d_shader_free_dxbc() is used to free vkd3d_shader_dxbc_desc - structures, as returned by vkd3d_shader_parse_dxbc(). - - The VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE compile option - can be used to specify whether SPIR-V shaders targeting Vulkan - environments should write point sizes for geometry and tessellation - shaders. If left unspecified, point sizes will be written. + - 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. + +- 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. + +- Relative addressing of shader input registers is supported by SPIR-V + targets. diff --git a/AUTHORS b/AUTHORS index 622aecbb0..6d4f0e061 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,7 @@ Chip Davis Conor McCarthy David Gow Derek Lesho +Ethan Lee Fabian Maurer Francisco Casas Francois Gouget @@ -16,6 +17,7 @@ Hans-Kristian Arntzen Henri Verbeet Isabella Bosia Jactry Zeng +Jan Sikorski Joshua Ashton Józef Kucia Martin Storsjö diff --git a/Makefile.am b/Makefile.am index db67423b2..fb5bc88f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -283,7 +283,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 6:0:5 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 7:0:6 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -317,7 +317,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vulkan_procs.h libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE -libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 8:0:7 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 9:0:8 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -329,7 +329,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE -libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:3:3 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:4:3 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index c69d87094..f90391580 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.7]) +AC_INIT([vkd3d],[1.8]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 5adf44eed..5ebe0ff9d 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -19,7 +19,7 @@ #define VK_NO_PROTOTYPES #define VK_USE_PLATFORM_XCB_KHR -#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_7 +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_8 #include "config.h" #include <vkd3d.h> #include <vkd3d_utils.h> diff --git a/include/vkd3d.h b/include/vkd3d.h index e5159d5e6..f36d9043e 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -76,6 +76,7 @@ enum vkd3d_api_version VKD3D_API_VERSION_1_5, VKD3D_API_VERSION_1_6, VKD3D_API_VERSION_1_7, + VKD3D_API_VERSION_1_8, VKD3D_FORCE_32_BIT_ENUM(VKD3D_API_VERSION), }; diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 859b8c797..274241546 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -49,6 +49,7 @@ enum vkd3d_shader_api_version VKD3D_SHADER_API_VERSION_1_5, VKD3D_SHADER_API_VERSION_1_6, VKD3D_SHADER_API_VERSION_1_7, + VKD3D_SHADER_API_VERSION_1_8, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_API_VERSION), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 080b22045..3542b5fac 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -201,7 +201,7 @@ enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval_indexed(enum vkd3d #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 -#define VKD3D_SPIRV_GENERATOR_VERSION 7 +#define VKD3D_SPIRV_GENERATOR_VERSION 8 #define VKD3D_SPIRV_GENERATOR_MAGIC vkd3d_make_u32(VKD3D_SPIRV_GENERATOR_VERSION, VKD3D_SPIRV_GENERATOR_ID) struct vkd3d_spirv_stream diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index aa1ac5fed..8a349ba85 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -210,7 +210,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option = &options[0]; option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; - option->value = VKD3D_SHADER_API_VERSION_1_7; + option->value = VKD3D_SHADER_API_VERSION_1_8; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; @@ -315,7 +315,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_7}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_8}, }; TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c964ea8fe..5e46b4672 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1958,7 +1958,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_7}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_8}, {VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV, typed_uav_compile_option(device)}, {VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE, 0}, }; @@ -2011,7 +2011,7 @@ static int vkd3d_scan_dxbc(const struct d3d12_device *device, const D3D12_SHADER const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_7}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_8}, {VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV, typed_uav_compile_option(device)}, }; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 52488e86a..efb3b48d0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -726,7 +726,7 @@ int main(int argc, char **argv) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); - add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_7); + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_8); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info; -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
This merge request was approved by Henri Verbeet. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/244
participants (6)
-
Francisco Casas -
Henri Verbeet
-
Henri Verbeet (＠hverbeet)
-
Nikolay Sivov
-
Zebediah Figura
-
Zebediah Figura (＠zfigura)