wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Parse empty technique declarations.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2023-11-01 22:53:29 +01:00 committed by Alexandre Julliard
parent 53b0101a53
commit dbcc4c4e40
Notes: Alexandre Julliard 2023-11-02 22:50:16 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/437
4 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libs/vkd3d-shader/hlsl.y
View File

@ -4955,6 +4955,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls
%type <name> any_identifier %type <name> any_identifier
%type <name> var_identifier %type <name> var_identifier
%type <name> technique_name
%type <parameter> parameter %type <parameter> parameter
@ -4996,8 +4997,50 @@ hlsl_prog:
destroy_block($2); destroy_block($2);
} }
| hlsl_prog preproc_directive | hlsl_prog preproc_directive
| hlsl_prog technique
| hlsl_prog ';' | hlsl_prog ';'
technique_name:
%empty
{
$$ = NULL;
}
| any_identifier
pass_list:
%empty
technique9:
KW_TECHNIQUE technique_name '{' pass_list '}'
{
hlsl_fixme(ctx, &@$, "Unsupported \'technique\' declaration.");
}
technique10:
KW_TECHNIQUE10 technique_name '{' pass_list '}'
{
if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2)
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
"The 'technique10' keyword is invalid for this profile.");
hlsl_fixme(ctx, &@$, "Unsupported \'technique10\' declaration.");
}
technique11:
KW_TECHNIQUE11 technique_name '{' pass_list '}'
{
if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2)
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
"The 'technique11' keyword is invalid for this profile.");
hlsl_fixme(ctx, &@$, "Unsupported \'technique11\' declaration.");
}
technique:
technique9
| technique10
| technique11
buffer_declaration: buffer_declaration:
buffer_type any_identifier colon_attribute buffer_type any_identifier colon_attribute
{ {

6
tests/hlsl/technique-fx_2.shader_test
View File

@ -76,7 +76,7 @@ technique10
float4 f; float4 f;
% fx_5_0 keyword fails with fx_2_0 profile % fx_5_0 keyword fails with fx_2_0 profile
[effect fail] [effect fail todo]
technique technique
{ {
} }
@ -85,7 +85,7 @@ technique11
{ {
} }
[effect fail] [effect fail todo]
technique technique
{ {
} }
@ -94,7 +94,7 @@ tEchnique10
{ {
} }
[effect fail] [effect fail todo]
technique technique
{ {
} }

4
tests/hlsl/technique-fx_4.shader_test
View File

@ -46,7 +46,7 @@ technique11
{ {
} }
[effect fail] [effect fail todo]
technique technique
{ {
} }
@ -55,7 +55,7 @@ tEchnique10
{ {
} }
[effect fail] [effect fail todo]
technique technique
{ {
} }

4
tests/hlsl/technique-fx_5.shader_test
View File

@ -46,7 +46,7 @@ technique11
{ {
} }
[effect fail] [effect fail todo]
technique technique
{ {
} }
@ -55,7 +55,7 @@ tEchnique10
{ {
} }
[effect fail] [effect fail todo]
technique technique
{ {
} }