Module: vkd3d Branch: master Commit: ea8ff5394ceb5f83bc36dbbda7d9d0738ba10971 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea8ff5394ceb5f83bc36dbbda7d9d0...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Nov 1 21:54:17 2023 +0100
vkd3d-shader/hlsl: Add a keyword for fx_5_0 techniques.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com
---
libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 1 + tests/hlsl/technique-fx_2.shader_test | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 527d853a..a6b78ddf 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -133,6 +133,7 @@ switch {return KW_SWITCH; } tbuffer {return KW_TBUFFER; } technique {return KW_TECHNIQUE; } technique10 {return KW_TECHNIQUE10; } +technique11 {return KW_TECHNIQUE11; } texture {return KW_TEXTURE; } texture1D {return KW_TEXTURE1D; } Texture1D {return KW_TEXTURE1D; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 71c0ae46..8acfc666 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4832,6 +4832,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token KW_TBUFFER %token KW_TECHNIQUE %token KW_TECHNIQUE10 +%token KW_TECHNIQUE11 %token KW_TEXTURE %token KW_TEXTURE1D %token KW_TEXTURE1DARRAY diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 9eaa9a65..978dece1 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -15,7 +15,7 @@ float4 main() : sv_target return technique10; }
-[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 technique11 = {0, 0, 0, 0};