wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Support string annotations for fx_4+.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-08-13 23:59:41 +02:00 committed by Henri Verbeet
parent d4ae844bb6
commit 60ce81112b
Notes: Henri Verbeet 2024-08-14 22:15:51 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/995
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/vkd3d-shader/fx.c
View File

@ -1360,6 +1360,10 @@ static void write_fx_4_annotation(struct hlsl_ir_var *var, struct fx_write_conte
offset = write_fx_4_default_value(var->data_type, var->default_values, fx); offset = write_fx_4_default_value(var->data_type, var->default_values, fx);
put_u32(buffer, offset); put_u32(buffer, offset);
} }
else if (type->class == HLSL_CLASS_STRING)
{
write_fx_4_string_initializer(var, fx);
}
else else
{ {
hlsl_fixme(ctx, &var->loc, "Writing annotations for type class %u is not implemented.", type->class); hlsl_fixme(ctx, &var->loc, "Writing annotations for type class %u is not implemented.", type->class);

2
tests/hlsl/strings.shader_test
View File

@ -110,7 +110,7 @@ float4 main() : sv_target { return 0; }
shader model >= 5.0 shader model >= 5.0
shader model < 6.0 shader model < 6.0
[effect todo] [effect]
float4 f float4 f
< <
string a = "\nAAA\tBBB\rCCC\fDDD\vEEE\sFFF"; string a = "\nAAA\tBBB\rCCC\fDDD\vEEE\sFFF";