From: Nikolay Sivov nsivov@codeweavers.com
--- libs/vkd3d-shader/hlsl.c | 6 ++++-- tests/hlsl-type-names.shader_test | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 02c62a47..251aebd4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -549,8 +549,10 @@ static const char * get_case_insensitive_typename(const char *name) "dword", "float", "matrix", + "pixelshader", "string", "vector", + "vertexshader", }; unsigned int i;
@@ -2790,8 +2792,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"string", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, - {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, - {"VERTEXSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, + {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, + {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, };
for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test index f6506f6e..797baf8e 100644 --- a/tests/hlsl-type-names.shader_test +++ b/tests/hlsl-type-names.shader_test @@ -1,4 +1,8 @@ [pixel shader] + +verteXshader vs; +pixelShader ps; + float4 main() : sv_target { vector<fLoat, 4> f1 = {1.0, 2.0, 3.0, 4.0};