- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/fx: Don't use an array to write the type class.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 047040fc635101667859b712a9cc19d381892a94 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/047040fc635101667859b712a9cc1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 9 16:05:33 2024 -0500 vkd3d-shader/fx: Don't use an array to write the type class. --- libs/vkd3d-shader/fx.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 406e938d..0c013446 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -404,14 +404,6 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co uint32_t name_offset, offset, size, stride, numeric_desc; uint32_t elements_count = 0; const char *name; - static const uint32_t variable_type[] = - { - [HLSL_CLASS_SCALAR] = 1, - [HLSL_CLASS_VECTOR] = 1, - [HLSL_CLASS_MATRIX] = 1, - [HLSL_CLASS_OBJECT] = 2, - [HLSL_CLASS_STRUCT] = 3, - }; struct hlsl_ctx *ctx = fx->ctx; /* Resolve arrays to element type and number of elements. */ @@ -431,13 +423,19 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_SCALAR: case HLSL_CLASS_VECTOR: case HLSL_CLASS_MATRIX: + put_u32_unaligned(buffer, 1); + break; + case HLSL_CLASS_OBJECT: + put_u32_unaligned(buffer, 2); + break; + case HLSL_CLASS_STRUCT: - put_u32_unaligned(buffer, variable_type[type->class]); + put_u32_unaligned(buffer, 3); break; - default: - hlsl_fixme(ctx, &ctx->location, "Writing type class %u is not implemented.", type->class); - return 0; + + case HLSL_CLASS_ARRAY: + vkd3d_unreachable(); } size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float);

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Emit half results when operating on half arguments.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: ecad299ba416e4f7cc98677fa2596d29ef2555ab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ecad299ba416e4f7cc98677fa2596… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 8 12:51:34 2024 +0200 vkd3d-shader/hlsl: Emit half results when operating on half arguments. --- libs/vkd3d-shader/hlsl.y | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e81da352..03e14d84 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2682,12 +2682,14 @@ static bool elementwise_intrinsic_convert_args(struct hlsl_ctx *ctx, static bool elementwise_intrinsic_float_convert_args(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { + enum hlsl_base_type base_type; struct hlsl_type *type; if (!(type = elementwise_intrinsic_get_common_type(ctx, params, loc))) return false; - type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + base_type = type->base_type == HLSL_TYPE_HALF ? HLSL_TYPE_HALF : HLSL_TYPE_FLOAT; + type = hlsl_get_numeric_type(ctx, type->class, base_type, type->dimx, type->dimy); return convert_args(ctx, params, type, loc); }

1 0

Zebediah Figura : vkd3d-shader/fx: Move unimplemented type checks into is_type_supported_fx_2().
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 6c6106f780906e862ea86d24d114786462fbc18d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6c6106f780906e862ea86d24d1147… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 9 16:40:56 2024 -0500 vkd3d-shader/fx: Move unimplemented type checks into is_type_supported_fx_2(). --- libs/vkd3d-shader/fx.c | 93 ++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 49 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 0c013446..1f587260 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -631,7 +631,6 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n { struct vkd3d_bytecode_buffer *buffer = &fx->unstructured; uint32_t semantic_offset, offset, elements_count = 0, name_offset; - struct hlsl_ctx *ctx = fx->ctx; size_t i; /* Resolve arrays to element type and number of elements. */ @@ -644,23 +643,6 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n name_offset = write_string(name, fx); semantic_offset = write_string(semantic->name, fx); - switch (type->base_type) - { - case HLSL_TYPE_DOUBLE: - case HLSL_TYPE_HALF: - case HLSL_TYPE_FLOAT: - case HLSL_TYPE_BOOL: - case HLSL_TYPE_INT: - case HLSL_TYPE_UINT: - case HLSL_TYPE_VOID: - case HLSL_TYPE_TEXTURE: - break; - default: - hlsl_fixme(ctx, &ctx->location, "Writing parameter type %u is not implemented.", - type->base_type); - return 0; - }; - offset = put_u32(buffer, hlsl_sm1_base_type(type)); put_u32(buffer, hlsl_sm1_class(type)); put_u32(buffer, name_offset); @@ -690,6 +672,9 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n for (i = 0; i < type->e.record.field_count; ++i) { const struct hlsl_struct_field *field = &type->e.record.fields[i]; + + /* Validated in check_invalid_object_fields(). */ + assert(hlsl_is_numeric_type(field->type)); write_fx_2_parameter(field->type, field->name, &field->semantic, fx); } } @@ -777,44 +762,54 @@ static uint32_t write_fx_2_initial_value(const struct hlsl_ir_var *var, struct f return offset; } -static bool is_type_supported_fx_2(const struct hlsl_type *type) +static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type *type, + const struct vkd3d_shader_location *loc) { - type = hlsl_get_multiarray_element_type(type); - - if (type->class == HLSL_CLASS_STRUCT) - return true; - - switch (type->base_type) + switch (type->class) { - case HLSL_TYPE_FLOAT: - case HLSL_TYPE_HALF: - case HLSL_TYPE_DOUBLE: - case HLSL_TYPE_INT: - case HLSL_TYPE_UINT: - case HLSL_TYPE_BOOL: - case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: - case HLSL_TYPE_STRING: + case HLSL_CLASS_STRUCT: + /* Note that the fields must all be numeric; this was validated in + * check_invalid_object_fields(). */ return true; - case HLSL_TYPE_TEXTURE: - case HLSL_TYPE_SAMPLER: - switch (type->sampler_dim) + + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_VECTOR: + case HLSL_CLASS_MATRIX: + return true; + + case HLSL_CLASS_ARRAY: + return is_type_supported_fx_2(ctx, type->e.array.type, loc); + + case HLSL_CLASS_OBJECT: + switch (type->base_type) { - case HLSL_SAMPLER_DIM_1D: - case HLSL_SAMPLER_DIM_2D: - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - case HLSL_SAMPLER_DIM_GENERIC: - return true; + case HLSL_TYPE_TEXTURE: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_1D: + case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_3D: + case HLSL_SAMPLER_DIM_CUBE: + case HLSL_SAMPLER_DIM_GENERIC: + return true; + default: + return false; + } + break; + + case HLSL_TYPE_SAMPLER: + case HLSL_TYPE_STRING: + case HLSL_TYPE_PIXELSHADER: + case HLSL_TYPE_VERTEXSHADER: + hlsl_fixme(ctx, loc, "Write fx 2.0 parameter object type %#x.", type->base_type); + return false; + default: - ; + return false; } - break; - default: - return false; } - return false; + vkd3d_unreachable(); } static void write_fx_2_parameters(struct fx_write_context *fx) @@ -830,7 +825,7 @@ static void write_fx_2_parameters(struct fx_write_context *fx) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (!is_type_supported_fx_2(var->data_type)) + if (!is_type_supported_fx_2(ctx, var->data_type, &var->loc)) continue; desc_offset = write_fx_2_parameter(var->data_type, var->name, &var->semantic, fx);

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Test refract() intrinsic.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: fd9e1a87ffef8b24dd12cd27369bb1f81d61178d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd9e1a87ffef8b24dd12cd27369bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 7 14:16:15 2023 +0200 vkd3d-shader/hlsl: Test refract() intrinsic. With some changes by Giovanni Mascellani. --- Makefile.am | 1 + tests/hlsl/refract.shader_test | 233 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+) diff --git a/Makefile.am b/Makefile.am index 876b4f52..f823cbc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -165,6 +165,7 @@ vkd3d_shader_tests = \ tests/hlsl/precise-modifier.shader_test \ tests/hlsl/rasteriser-ordered-views.shader_test \ tests/hlsl/reflect.shader_test \ + tests/hlsl/refract.shader_test \ tests/hlsl/register-reservations-numeric.shader_test \ tests/hlsl/register-reservations-resources.shader_test \ tests/hlsl/return-implicit-conversion.shader_test \ diff --git a/tests/hlsl/refract.shader_test b/tests/hlsl/refract.shader_test new file mode 100644 index 00000000..ecd554b0 --- /dev/null +++ b/tests/hlsl/refract.shader_test @@ -0,0 +1,233 @@ +[pixel shader todo(sm<6)] +float4 r; +float4 n; +float i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +uniform 8 float 0.2 +todo(sm<6 | glsl) draw quad +probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 +uniform 8 float 100.0 +todo(sm<6 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo(sm<6)] +float4 r; +float4 n; +float i; + +float4 main() : sv_target +{ + float2 _r = float2(r.x, r.y); + float2 _n = float2(n.x, n.y); + return float4(refract(_r, _n, i), 0, 0); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +uniform 8 float 0.2 +todo(sm<6 | glsl) draw quad +probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 +uniform 8 float 100.0 +todo(sm<6 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo(sm<6)] +float4 r; +float4 n; +float i; + +float4 main() : sv_target +{ + float2 _r = float2(r.x, r.y); + return float4(refract(_r, n, i), 0, 0); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +uniform 8 float 0.2 +todo(sm<6 | glsl) draw quad +probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 +uniform 8 float 100.0 +todo(sm<6 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo(sm<6)] +float4 r; +float4 n; +float i; + +float4 main() : sv_target +{ + float2 _n = float2(n.x, n.y); + return float4(refract(r, _n, i), 0, 0); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +uniform 8 float 0.2 +todo(sm<6 | glsl) draw quad +probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 +uniform 8 float 100.0 +todo(sm<6 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo(sm<6)] +float4 r; +float4 n; +float i; + +float4 main() : sv_target +{ + float1 _r = float1(r.x); + float1 _n = float1(n.x); + return float4(refract(_r, _n, i), 0, 0, 0); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +uniform 8 float 0.2 +todo(sm<6 | glsl) draw quad +probe all rgba (-0.524978, 0.0, 0.0, 0.0) 32 +uniform 8 float 100.0 +todo(sm<6 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo(sm<6)] +float4 r; +float4 n; +float i; + +float4 main() : sv_target +{ + return refract(r, n.x, i); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +uniform 8 float 0.2 +todo(sm<6 | glsl) draw quad +probe all rgba (-0.5562381, -0.6762381, -0.6162381, -0.5962381) 32 +uniform 8 float 100.0 +todo(sm<6 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader fail(sm>=6) todo(sm<6)] +float4 r; +float4 n; +float4 i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[test] +uniform 0 float4 0.5 -0.1 0.2 0.3 +uniform 4 float4 0.6 0.4 -0.3 1.0 +uniform 8 float4 0.2 0.3 0.4 0.5 +if(sm<6) todo(sm<6 | glsl) draw quad +if(sm<6) probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 +uniform 8 float 100.0 +if(sm<6) todo(sm<6 | glsl) draw quad +if(sm<6) probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader fail] +float4x1 r; +float4 n; +float i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[pixel shader fail] +float1x4 r; +float4 n; +float i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[pixel shader fail] +float4 r; +float1x4 n; +float i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[pixel shader fail] +float4 r; +float4x1 n; +float i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[pixel shader fail] +float4 r; +float4 n; +float1x4 i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[pixel shader fail] +float4 r; +float4 n; +float4x1 i; + +float4 main() : sv_target +{ + return refract(r, n, i); +} + +[pixel shader todo(sm<6)] +float4 r; +float4 n; +float i; + +float detect(float4 x) +{ + return 1; +} + +float detect(half4 x) +{ + return 2; +} + +float4 main() : sv_target +{ + return float4(detect(refract((half4)r, (half4)n, (half)i)), + detect(refract(r, n, (half)i)), + detect(refract(r, (half4)n, i)), + detect(refract((half4)r, n, i))); +} + +[test] +todo(sm<6 | glsl) draw quad +if(sm<6) probe all rgba (2.0, 1.0, 1.0, 1.0) +if(sm>=6) probe all rgba (1.0, 1.0, 1.0, 1.0)

1 0

Zebediah Figura : vkd3d-shader/fx: Use a switch in write_fx_2_initial_value().
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 280bea90338c990ebfcd0b49b1c411616fde0fdc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/280bea90338c990ebfcd0b49b1c41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 9 19:01:34 2024 -0500 vkd3d-shader/fx: Use a switch in write_fx_2_initial_value(). --- libs/vkd3d-shader/fx.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 1f587260..1d90cd70 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -733,7 +733,7 @@ static uint32_t write_fx_2_initial_value(const struct hlsl_ir_var *var, struct f { struct vkd3d_bytecode_buffer *buffer = &fx->unstructured; const struct hlsl_type *type = var->data_type; - uint32_t i, offset, size, elements_count = 1; + uint32_t offset, size, elements_count = 1; size = get_fx_2_type_size(type); @@ -743,20 +743,27 @@ static uint32_t write_fx_2_initial_value(const struct hlsl_ir_var *var, struct f type = hlsl_get_multiarray_element_type(type); } - if (type->class == HLSL_CLASS_OBJECT) - { - /* Objects are given sequential ids. */ - offset = put_u32(buffer, fx->object_variable_count++); - for (i = 1; i < elements_count; ++i) - put_u32(buffer, fx->object_variable_count++); - } - else + /* Note that struct fields must all be numeric; + * this was validated in check_invalid_object_fields(). */ + switch (type->class) { - /* FIXME: write actual initial value */ - offset = put_u32(buffer, 0); + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_VECTOR: + case HLSL_CLASS_MATRIX: + case HLSL_CLASS_STRUCT: + /* FIXME: write actual initial value */ + offset = put_u32(buffer, 0); + + for (uint32_t i = 1; i < size / sizeof(uint32_t); ++i) + put_u32(buffer, 0); + break; - for (i = 1; i < size / sizeof(uint32_t); ++i) - put_u32(buffer, 0); + default: + /* Objects are given sequential ids. */ + offset = put_u32(buffer, fx->object_variable_count++); + for (uint32_t i = 1; i < elements_count; ++i) + put_u32(buffer, fx->object_variable_count++); + break; } return offset;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Map HLSL_TYPE_DOUBLE to D3DXPT_FLOAT.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: a882d60534fc6574ac48430b0da4eedbdddc1d20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a882d60534fc6574ac48430b0da4e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 9 18:12:48 2024 -0500 vkd3d-shader/hlsl: Map HLSL_TYPE_DOUBLE to D3DXPT_FLOAT. --- libs/vkd3d-shader/d3dbc.c | 9 +++++++++ libs/vkd3d-shader/fx.c | 1 + 2 files changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 97650942..1ad97add 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1526,6 +1526,15 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) { case HLSL_TYPE_BOOL: return D3DXPT_BOOL; + /* Actually double behaves differently depending on DLL version: + * For <= 36, it maps to D3DXPT_FLOAT. + * For 37-40, it maps to zero (D3DXPT_VOID). + * For >= 41, it maps to 39, which is D3D_SVT_DOUBLE (note D3D_SVT_* + * values are mostly compatible with D3DXPT_*). + * However, the latter two cases look like bugs, and a reasonable + * application certainly wouldn't know what to do with them. + * For fx_2_0 it's always D3DXPT_FLOAT regardless of DLL version. */ + case HLSL_TYPE_DOUBLE: case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: return D3DXPT_FLOAT; diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 5bed9c7e..406e938d 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -648,6 +648,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n switch (type->base_type) { + case HLSL_TYPE_DOUBLE: case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: case HLSL_TYPE_BOOL:

1 0

Stefan Dösinger : vkd3d: Implement reopening existing caches.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: a7860ae752821958f3e9c51db7dfdd88bb92ac4c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a7860ae752821958f3e9c51db7dfd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 27 13:43:49 2024 +0300 vkd3d: Implement reopening existing caches. --- include/private/vkd3d_common.h | 6 ++++ libs/vkd3d/device.c | 62 +++++++++++++++++++++++++++++++++++++----- tests/d3d12.c | 13 ++++++--- 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 6a8694a7..10e2afd5 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -438,6 +438,12 @@ struct vkd3d_mutex #endif }; +#ifdef _WIN32 +#define VKD3D_MUTEX_INITIALIZER {{NULL, -1, 0, 0, 0, 0}} +#else +#define VKD3D_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif + static inline void vkd3d_mutex_init(struct vkd3d_mutex *lock) { #ifdef _WIN32 diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 266465e0..90de27c5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2529,12 +2529,17 @@ struct d3d12_cache_session ID3D12ShaderCacheSession ID3D12ShaderCacheSession_iface; unsigned int refcount; + struct list cache_list_entry; + struct d3d12_device *device; struct vkd3d_private_store private_store; D3D12_SHADER_CACHE_SESSION_DESC desc; struct vkd3d_shader_cache *cache; }; +static struct vkd3d_mutex cache_list_mutex = VKD3D_MUTEX_INITIALIZER; +static struct list cache_list = LIST_INIT(cache_list); + static inline struct d3d12_cache_session *impl_from_ID3D12ShaderCacheSession(ID3D12ShaderCacheSession *iface) { return CONTAINING_RECORD(iface, struct d3d12_cache_session, ID3D12ShaderCacheSession_iface); @@ -2583,6 +2588,10 @@ static void d3d12_cache_session_destroy(struct d3d12_cache_session *session) TRACE("Destroying cache session %p.\n", session); + vkd3d_mutex_lock(&cache_list_mutex); + list_remove(&session->cache_list_entry); + vkd3d_mutex_unlock(&cache_list_mutex); + vkd3d_shader_cache_decref(session->cache); vkd3d_private_store_destroy(&session->private_store); vkd3d_free(session); @@ -2709,12 +2718,14 @@ static const struct ID3D12ShaderCacheSessionVtbl d3d12_cache_session_vtbl = static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, struct d3d12_device *device, const D3D12_SHADER_CACHE_SESSION_DESC *desc) { + struct d3d12_cache_session *i; enum vkd3d_result ret; HRESULT hr; session->ID3D12ShaderCacheSession_iface.lpVtbl = &d3d12_cache_session_vtbl; session->refcount = 1; session->desc = *desc; + session->cache = NULL; if (!session->desc.MaximumValueFileSizeBytes) session->desc.MaximumValueFileSizeBytes = 128 * 1024 * 1024; @@ -2726,20 +2737,56 @@ static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, if (FAILED(hr = vkd3d_private_store_init(&session->private_store))) return hr; - if (session->desc.Mode == D3D12_SHADER_CACHE_MODE_DISK) - FIXME("Disk caches are not yet implemented.\n"); + vkd3d_mutex_lock(&cache_list_mutex); - ret = vkd3d_shader_open_cache(&session->cache); - if (ret) + /* We expect the number of open caches to be small. */ + LIST_FOR_EACH_ENTRY(i, &cache_list, struct d3d12_cache_session, cache_list_entry) { - WARN("Failed to open shader cache.\n"); - vkd3d_private_store_destroy(&session->private_store); - return hresult_from_vkd3d_result(ret); + if (!memcmp(&i->desc.Identifier, &desc->Identifier, sizeof(desc->Identifier))) + { + TRACE("Found an existing cache %p from session %p.\n", i->cache, i); + if (desc->Version == i->desc.Version) + { + session->desc = i->desc; + vkd3d_shader_cache_incref(session->cache = i->cache); + break; + } + else + { + WARN("version mismatch: Existing %"PRIu64" new %"PRIu64".\n", + i->desc.Version, desc->Version); + hr = DXGI_ERROR_ALREADY_EXISTS; + goto error; + } + } } + if (!session->cache) + { + if (session->desc.Mode == D3D12_SHADER_CACHE_MODE_DISK) + FIXME("Disk caches are not yet implemented.\n"); + + ret = vkd3d_shader_open_cache(&session->cache); + if (ret) + { + WARN("Failed to open shader cache.\n"); + hr = hresult_from_vkd3d_result(ret); + goto error; + } + } + + /* Add it to the list even if we reused an existing cache. The other session might be destroyed, + * but the cache stays alive and can be opened a third time. */ + list_add_tail(&cache_list, &session->cache_list_entry); d3d12_device_add_ref(session->device = device); + vkd3d_mutex_unlock(&cache_list_mutex); return S_OK; + +error: + vkd3d_private_store_destroy(&session->private_store); + vkd3d_mutex_unlock(&cache_list_mutex); + return hr; } /* ID3D12Device */ @@ -4888,6 +4935,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateShaderCacheSession(ID3D12Dev WARN("No output pointer, returning S_FALSE.\n"); return S_FALSE; } + *session = NULL; if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/tests/d3d12.c b/tests/d3d12.c index 1605d6e5..be92cba8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -38477,10 +38477,8 @@ static void test_shader_cache(void) session2 = (void *)0xdeadbeef; hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, (void **)&session2); - todo ok(hr == DXGI_ERROR_ALREADY_EXISTS, "Got unexpected hr %#x.\n", hr); - todo ok(!session2, "Got unexpected pointer %p.\n", session2); - if (session2) - ID3D12ShaderCacheSession_Release(session2); + ok(hr == DXGI_ERROR_ALREADY_EXISTS, "Got unexpected hr %#x.\n", hr); + ok(!session2, "Got unexpected pointer %p.\n", session2); hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_IUnknown, NULL); ok(hr == S_FALSE, "NULL outptr: Got hr %#x.\n", hr); @@ -38489,9 +38487,16 @@ static void test_shader_cache(void) refcount = get_refcount(device); ok(refcount == base_refcount, "Got unexpected refcount %u.\n", refcount); + /* Create two sessions with the same cache GUID. */ hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, (void **)&session); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, + &IID_ID3D12ShaderCacheSession, (void **)&session2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(session2 != session, "Expected different interface pointers, got %p for both.\n", + session); + ID3D12ShaderCacheSession_Release(session2); ID3D12ShaderCacheSession_Release(session); ID3D12Device9_Release(device);

1 0

Stefan Dösinger : tests: Add CreateShaderCacheSession pointer clearing tests.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 26387e1d4b4e9449b11e8657b421d6e9d6845020 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/26387e1d4b4e9449b11e8657b421d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 5 15:30:36 2024 +0300 tests: Add CreateShaderCacheSession pointer clearing tests. Native's behavior is inconsistent. It sets the pointer to NULL when it fails to open an existing cache due to a version mismatch, but leaves the pointer untouched when the description fails validation. --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7108068b..1605d6e5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -38338,6 +38338,7 @@ static void test_shader_cache(void) base_refcount = get_refcount(device); /* The description needs to be non-NULL and have at least the identifier set. */ + unk = (IUnknown *)0xdeadbeef; hr = ID3D12Device9_CreateShaderCacheSession(device, NULL, &IID_IUnknown, (void **)&unk); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12Device9_CreateShaderCacheSession(device, NULL, &IID_IUnknown, NULL); @@ -38348,6 +38349,7 @@ static void test_shader_cache(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, NULL, (void **)&unk); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(unk == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", unk); desc.Identifier = test_guid; desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; @@ -38396,10 +38398,13 @@ static void test_shader_cache(void) (void **)&session); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D12ShaderCacheSession_Release(session); + + session = (ID3D12ShaderCacheSession *)0xdeadbeef; desc.MaximumValueFileSizeBytes = 1024 * 1024 * 1024 + 1; hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, (void **)&session); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(session == (ID3D12ShaderCacheSession *)0xdeadbeef, "Got unexpected pointer %p.\n", unk); memset(&desc, 0, sizeof(desc)); desc.Identifier = test_guid; @@ -38420,6 +38425,7 @@ static void test_shader_cache(void) desc.Identifier = test_guid; desc.Mode = D3D12_SHADER_CACHE_MODE_MEMORY; desc.Flags = 0x1245670; + session = (ID3D12ShaderCacheSession *)0xdeadbeef; hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, (void **)&session); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -38428,6 +38434,7 @@ static void test_shader_cache(void) hr = ID3D12Device9_CreateShaderCacheSession(device, &desc, &IID_ID3D12ShaderCacheSession, (void **)&session); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(session == (ID3D12ShaderCacheSession *)0xdeadbeef, "Got unexpected pointer %p.\n", unk); memset(&desc, 0, sizeof(desc)); desc.Identifier = test_guid;

1 0

Conor McCarthy : vkd3d: Validate presence of flag ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL for multisampled resources.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 78301d720205439acac6f19952b5c16bc0dfd583 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78301d720205439acac6f19952b5c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 9 17:17:58 2024 +1000 vkd3d: Validate presence of flag ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL for multisampled resources. --- libs/vkd3d/resource.c | 7 +++++++ tests/d3d12.c | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b83a45d0..60dffe3d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1893,6 +1893,13 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC1 *desc, struct d3 WARN("Invalid sample count 0.\n"); return E_INVALIDARG; } + if (desc->SampleDesc.Count > 1 + && !(desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL))) + { + WARN("Sample count %u invalid without ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL.\n", + desc->SampleDesc.Count); + return E_INVALIDARG; + } if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { diff --git a/tests/d3d12.c b/tests/d3d12.c index a0d738ac..69d72fb7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1607,10 +1607,7 @@ static void test_create_committed_resource(void) resource_desc.Flags = 0; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12Resource_Release(resource); resource_desc.Format = DXGI_FORMAT_D32_FLOAT; resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;

1 0

Conor McCarthy : tests/d3d12: Test resource flags for multisampled resources.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: e46de1daa28f447aa13c5d0e98f94f226a6ddb52 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e46de1daa28f447aa13c5d0e98f94… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 9 13:22:06 2024 +1000 tests/d3d12: Test resource flags for multisampled resources. --- tests/d3d12.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index be92cba8..a0d738ac 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1601,7 +1601,25 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* The ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL flag is required for multisampled resources. */ + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, &IID_ID3D12Resource, (void **)&resource); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + + resource_desc.Format = DXGI_FORMAT_D32_FLOAT; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + ID3D12Resource_Release(resource); resource_desc.SampleDesc.Count = 1; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; resource_desc.Format = DXGI_FORMAT_UNKNOWN; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,

1 0