Merge pull request #648 from steve-lunarg/type-identifiers

HLSL: allow type keywords as identifiers, and add half type
2017-01-04 14:07:34 -07:00
parent ddfbbe26f2 5ca85ad9de
commit bf9a2f30c9
8 changed files with 657 additions and 21 deletions
--- a/gtests/Hlsl.FromFile.cpp
+++ b/gtests/Hlsl.FromFile.cpp
@@ -230,6 +230,8 @@ INSTANTIATE_TEST_CASE_P(
        {"hlsl.swizzle.frag", "PixelShaderFunction"},
        {"hlsl.templatetypes.frag", "PixelShaderFunction"},
        {"hlsl.tx.bracket.frag", "main"},
+        {"hlsl.type.half.frag", "main"},
+        {"hlsl.type.identifier.frag", "main"},
        {"hlsl.typedef.frag", "PixelShaderFunction"},
        {"hlsl.whileLoop.frag", "PixelShaderFunction"},
        {"hlsl.void.frag", "PixelShaderFunction"},