Module: vkd3d Branch: master Commit: 53b0101a53dca6d1dcda20559edb35238e07c5b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/53b0101a53dca6d1dcda20559edb35...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Nov 1 22:16:47 2023 +0100
vkd3d-shader/hlsl: Use case-insensitive match for the "technique" keyword.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com
---
libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl/technique-fx_2.shader_test | 4 ++-- tests/hlsl/technique-fx_4.shader_test | 2 +- tests/hlsl/technique-fx_5.shader_test | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index a6b78ddf..83fe1d34 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -131,7 +131,7 @@ string {return KW_STRING; } struct {return KW_STRUCT; } switch {return KW_SWITCH; } tbuffer {return KW_TBUFFER; } -technique {return KW_TECHNIQUE; } +(?i:technique) {return KW_TECHNIQUE; } technique10 {return KW_TECHNIQUE10; } technique11 {return KW_TECHNIQUE11; } texture {return KW_TEXTURE; } diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 978dece1..6e130747 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -1,7 +1,7 @@ [require] shader model < 3.0
-[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0}; @@ -30,7 +30,7 @@ float4 main() : sv_target return float4(0, 0, 0, 0); }
-[pixel shader fail todo] +[pixel shader fail] typedef float4 Technique;
float4 main() : sv_target diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 8102e78b..230553e5 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -2,7 +2,7 @@ shader model >= 4.0 shader model < 6.0
-[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0}; diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index 047ed2f2..f0b51198 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -2,7 +2,7 @@ shader model >= 5.0 shader model < 6.0
-[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0};