Henri Verbeet pushed to branch master at wine / vkd3d
Commits: f8108a47 by Francisco Casas at 2024-08-13T21:16:46+02:00 tests: Add additional string tests.
- - - - - 094e298c by Francisco Casas at 2024-08-13T21:19:01+02:00 vkd3d-shader/hlsl: Parse string default values.
- - - - - 355d4c4a by Francisco Casas at 2024-08-13T21:19:04+02:00 vkd3d-shader/hlsl: Skip writing string default values.
This causes a crash in the native compiler, but can only happen in ps_5_0 were it is possible to declare structs that are both used in the shader and contain strings.
struct { float a; string b; } apple = {1, "foobar"};
float4 main() : sv_target { return apple.a; }
In our case, hlsl_type_get_component_offset() triggered an assertion failure because it does not expect the string type. So this is replaced by an hlsl_error().
- - - - -
7 changed files:
- libs/vkd3d-shader/d3dbc.c - libs/vkd3d-shader/fx.c - libs/vkd3d-shader/hlsl.c - libs/vkd3d-shader/hlsl.h - libs/vkd3d-shader/hlsl.y - libs/vkd3d-shader/tpf.c - tests/hlsl/strings.shader_test
View it on GitLab: https://gitlab.winehq.org/wine/vkd3d/-/compare/e0b5fe1288ddc00926340482ec2c6...