wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Allow annotations on techniques.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2023-11-14 02:27:15 +01:00
committed by Alexandre Julliard
parent 76a689d43f
commit 2c1905b780
Notes: Alexandre Julliard 2024-01-23 23:03:22 +01:00 
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/565
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1122,7 +1122,7 @@ static bool add_pass(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *
} }
static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope,
const char *typename, const struct vkd3d_shader_location *loc) struct hlsl_scope *annotations, const char *typename, const struct vkd3d_shader_location *loc)
{ {
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
struct hlsl_type *type; struct hlsl_type *type;
@@ -1131,6 +1131,7 @@ static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_sc
if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL)))
return false; return false;
var->scope = scope; var->scope = scope;
var->annotations = annotations;
if (!hlsl_add_var(ctx, var, false)) if (!hlsl_add_var(ctx, var, false))
{ {
@@ -5306,17 +5307,17 @@ passes:
| scope_start pass_list | scope_start pass_list
technique9: technique9:
KW_TECHNIQUE name_opt '{' passes '}' KW_TECHNIQUE name_opt annotations_opt '{' passes '}'
{ {
struct hlsl_scope *scope = ctx->cur_scope; struct hlsl_scope *scope = ctx->cur_scope;
hlsl_pop_scope(ctx); hlsl_pop_scope(ctx);
if (!add_technique(ctx, $2, scope, "technique", &@1)) if (!add_technique(ctx, $2, scope, $3, "technique", &@1))
YYABORT; YYABORT;
} }
technique10: technique10:
KW_TECHNIQUE10 name_opt '{' passes '}' KW_TECHNIQUE10 name_opt annotations_opt '{' passes '}'
{ {
struct hlsl_scope *scope = ctx->cur_scope; struct hlsl_scope *scope = ctx->cur_scope;
hlsl_pop_scope(ctx); hlsl_pop_scope(ctx);
@@ -5325,12 +5326,12 @@ technique10:
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
"The 'technique10' keyword is invalid for this profile."); "The 'technique10' keyword is invalid for this profile.");
if (!add_technique(ctx, $2, scope, "technique10", &@1)) if (!add_technique(ctx, $2, scope, $3, "technique10", &@1))
YYABORT; YYABORT;
} }
technique11: technique11:
KW_TECHNIQUE11 name_opt '{' passes '}' KW_TECHNIQUE11 name_opt annotations_opt '{' passes '}'
{ {
struct hlsl_scope *scope = ctx->cur_scope; struct hlsl_scope *scope = ctx->cur_scope;
hlsl_pop_scope(ctx); hlsl_pop_scope(ctx);
@@ -5339,7 +5340,7 @@ technique11:
hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
"The 'technique11' keyword is invalid for this profile."); "The 'technique11' keyword is invalid for this profile.");
if (!add_technique(ctx, $2, scope, "technique11", &@1)) if (!add_technique(ctx, $2, scope, $3, "technique11", &@1))
YYABORT; YYABORT;
} }

30
tests/hlsl/annotations.shader_test
View File

@@ -2,19 +2,19 @@
shader model >= 4.0 shader model >= 4.0
shader model < 6.0 shader model < 6.0
[effect todo] [effect]
// Annotations on techniques // Annotations on techniques
technique10 t1 < int a = 1; > {} technique10 t1 < int a = 1; > {}
technique10 t2 < int a = 2; int t1 = 3; int t2 = 4; > {} technique10 t2 < int a = 2; int t1 = 3; int t2 = 4; > {}
[effect todo] [effect]
// Annotations on passes // Annotations on passes
technique10 t1 < int a = 1; > technique10 t1 < int a = 1; >
{ {
pass < int t1 = 2; > {} pass < int t1 = 2; > {}
} }
[effect todo] [effect]
// Using names from the global scope // Using names from the global scope
float a; float a;
@@ -23,32 +23,32 @@ technique10 t1 < int a = 1; >
pass < int a = 2; > {} pass < int a = 2; > {}
} }
[effect todo] [effect]
// Evaluated literal constant expression for initial values // Evaluated literal constant expression for initial values
technique10 < int a = 1+2; > {} technique10 < int a = 1+2; > {}
[effect todo] [effect]
// Using constant variables in the initializer // Using constant variables in the initializer
static const int b = 123; static const int b = 123;
technique10 < int a = b; > {} technique10 < int a = b; > {}
[effect todo] [effect]
// Implicitly sized array // Implicitly sized array
technique10 < float a[] = {1, 2}; > {} technique10 < float a[] = {1, 2}; > {}
[effect todo] [effect]
// Nested braces // Nested braces
technique10 < float4 a = {1, {{{2, {3}}, 4}}}; > {} technique10 < float4 a = {1, {{{2, {3}}, 4}}}; > {}
[effect todo] [effect]
// Flattening // Flattening
technique10 < float4 a = {1, float2(2, 3), 4}; > {} technique10 < float4 a = {1, float2(2, 3), 4}; > {}
[effect todo] [effect]
// Comma separated initializers // Comma separated initializers
technique10 < int a = 1, b = 2; > {} technique10 < int a = 1, b = 2; > {}
[effect todo] [effect]
// Majority modifier // Majority modifier
technique10 < row_major float3x2 m = {1, 2, 3, 4, 5, 6}; > {} technique10 < row_major float3x2 m = {1, 2, 3, 4, 5, 6}; > {}
@@ -66,7 +66,7 @@ technique10
pass < int a = 0; float a = 1.0; > {} pass < int a = 0; float a = 1.0; > {}
} }
[effect fail] [effect fail todo]
// Without initializer // Without initializer
technique10 < int a; > {} technique10 < int a; > {}
@@ -74,17 +74,17 @@ technique10 < int a; > {}
// Only numeric types and strings are allowed // Only numeric types and strings are allowed
technique10 < DepthStencilState ds = { 0 }; > {} technique10 < DepthStencilState ds = { 0 }; > {}
[effect fail] [effect fail todo]
// Type declarations are not allowed // Type declarations are not allowed
technique10 < struct s { int a; } var = { 2 }; > {} technique10 < struct s { int a; } var = { 2 }; > {}
[effect fail] [effect fail todo]
// Static modifier is not allowed // Static modifier is not allowed
technique10 < static int a = 5; > {} technique10 < static int a = 5; > {}
[effect fail] [effect fail todo]
// Initializer should not depend on other annotations // Initializer should not depend on other annotations
technique10 < int a = 1, b = a; > {} technique10 < int a = 1, b = a; > {}
[effect fail] [effect fail todo]
technique10 < int a = 1; int b = a; > {} technique10 < int a = 1; int b = a; > {}