diff --git a/Test/baseResults/hlsl.intrinsics.negative.frag.out b/Test/baseResults/hlsl.intrinsics.negative.frag.out
index 8f770c88aed7dde7032512f309511c3b3407bec6..4c514d0adc4b09e5d5b8f0441e3fcdad2c2d947c 100644
--- a/Test/baseResults/hlsl.intrinsics.negative.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.negative.frag.out
@@ -1,6 +1,5 @@
hlsl.intrinsics.negative.frag
ERROR: 0:10: 'determinant' : no matching overloaded function found
-ERROR: 0:23: 'length' : ambiguous best function under implicit type conversion
ERROR: 0:25: 'normalize' : ambiguous best function under implicit type conversion
ERROR: 0:26: 'reflect' : ambiguous best function under implicit type conversion
ERROR: 0:27: 'refract' : ambiguous best function under implicit type conversion
@@ -59,7 +58,7 @@ ERROR: 0:133: 'normalize' : no matching overloaded function found
ERROR: 0:133: 'reflect' : no matching overloaded function found
ERROR: 0:133: 'refract' : no matching overloaded function found
ERROR: 0:133: 'reversebits' : no matching overloaded function found
-ERROR: 60 compilation errors. No code generated.
+ERROR: 59 compilation errors. No code generated.
Shader version: 450
@@ -120,8 +119,7 @@ ERROR: node is still EOpNull!
0:14 Convert float to uint ( temp uint)
0:14 'inF0' ( in float)
0:23 length ( temp float)
-0:23 Construct vec2 ( in 2-component vector of float)
-0:23 'inF0' ( in float)
+0:23 'inF0' ( in float)
0:24 Function Call: msad4(u1;vu2;vu4; ( temp 4-component vector of uint)
0:24 Convert float to uint ( temp uint)
0:24 'inF0' ( in float)
@@ -582,8 +580,7 @@ ERROR: node is still EOpNull!
0:14 Convert float to uint ( temp uint)
0:14 'inF0' ( in float)
0:23 length ( temp float)
-0:23 Construct vec2 ( in 2-component vector of float)
-0:23 'inF0' ( in float)
+0:23 'inF0' ( in float)
0:24 Function Call: msad4(u1;vu2;vu4; ( temp 4-component vector of uint)
0:24 Convert float to uint ( temp uint)
0:24 'inF0' ( in float)
diff --git a/Test/baseResults/hlsl.scalar-length.frag.out b/Test/baseResults/hlsl.scalar-length.frag.out
new file mode 100644
index 0000000000000000000000000000000000000000..a0603a461c3f74844f5cbb717ff1b4b8aa2d58a1
--- /dev/null
+++ b/Test/baseResults/hlsl.scalar-length.frag.out
@@ -0,0 +1,111 @@
+hlsl.scalar-length.frag
+Shader version: 450
+gl_FragCoord origin is upper left
+0:? Sequence
+0:2 Function Definition: @main( ( temp 4-component vector of float)
+0:2 Function Parameters:
+0:? Sequence
+0:3 Sequence
+0:3 move second child to first child ( temp 4-component vector of float)
+0:3 'test' ( temp 4-component vector of float)
+0:3 Constant:
+0:3 0.000000
+0:3 1.000000
+0:3 2.000000
+0:3 3.000000
+0:5 Branch: Return with expression
+0:5 Construct vec4 ( temp 4-component vector of float)
+0:5 length ( temp float)
+0:5 direct index ( temp float)
+0:5 'test' ( temp 4-component vector of float)
+0:5 Constant:
+0:5 3 (const int)
+0:2 Function Definition: main( ( temp void)
+0:2 Function Parameters:
+0:? Sequence
+0:2 move second child to first child ( temp 4-component vector of float)
+0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
+0:2 Function Call: @main( ( temp 4-component vector of float)
+0:? Linker Objects
+0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
+
+
+Linked fragment stage:
+
+
+Shader version: 450
+gl_FragCoord origin is upper left
+0:? Sequence
+0:2 Function Definition: @main( ( temp 4-component vector of float)
+0:2 Function Parameters:
+0:? Sequence
+0:3 Sequence
+0:3 move second child to first child ( temp 4-component vector of float)
+0:3 'test' ( temp 4-component vector of float)
+0:3 Constant:
+0:3 0.000000
+0:3 1.000000
+0:3 2.000000
+0:3 3.000000
+0:5 Branch: Return with expression
+0:5 Construct vec4 ( temp 4-component vector of float)
+0:5 length ( temp float)
+0:5 direct index ( temp float)
+0:5 'test' ( temp 4-component vector of float)
+0:5 Constant:
+0:5 3 (const int)
+0:2 Function Definition: main( ( temp void)
+0:2 Function Parameters:
+0:? Sequence
+0:2 move second child to first child ( temp 4-component vector of float)
+0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
+0:2 Function Call: @main( ( temp 4-component vector of float)
+0:? Linker Objects
+0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
+
+// Module Version 10000
+// Generated by (magic number): 80001
+// Id's are bound by 30
+
+ Capability Shader
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Fragment 4 "main" 28
+ ExecutionMode 4 OriginUpperLeft
+ Name 4 "main"
+ Name 9 "@main("
+ Name 12 "test"
+ Name 28 "@entryPointOutput"
+ Decorate 28(@entryPointOutput) Location 0
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeFloat 32
+ 7: TypeVector 6(float) 4
+ 8: TypeFunction 7(fvec4)
+ 11: TypePointer Function 7(fvec4)
+ 13: 6(float) Constant 0
+ 14: 6(float) Constant 1065353216
+ 15: 6(float) Constant 1073741824
+ 16: 6(float) Constant 1077936128
+ 17: 7(fvec4) ConstantComposite 13 14 15 16
+ 18: TypeInt 32 0
+ 19: 18(int) Constant 3
+ 20: TypePointer Function 6(float)
+ 27: TypePointer Output 7(fvec4)
+28(@entryPointOutput): 27(ptr) Variable Output
+ 4(main): 2 Function None 3
+ 5: Label
+ 29: 7(fvec4) FunctionCall 9(@main()
+ Store 28(@entryPointOutput) 29
+ Return
+ FunctionEnd
+ 9(@main(): 7(fvec4) Function None 8
+ 10: Label
+ 12(test): 11(ptr) Variable Function
+ Store 12(test) 17
+ 21: 20(ptr) AccessChain 12(test) 19
+ 22: 6(float) Load 21
+ 23: 6(float) ExtInst 1(GLSL.std.450) 66(Length) 22
+ 24: 7(fvec4) CompositeConstruct 23 23 23 23
+ ReturnValue 24
+ FunctionEnd
diff --git a/Test/hlsl.scalar-length.frag b/Test/hlsl.scalar-length.frag
new file mode 100644
index 0000000000000000000000000000000000000000..2b7ebdb92d1a2d652ed6d10325856e63fe0e293d
--- /dev/null
+++ b/Test/hlsl.scalar-length.frag
@@ -0,0 +1,6 @@
+float4 main() : SV_Target0
+{
+ float4 test = { 0, 1, 2, 3 };
+
+ return length(test.a);
+}
diff --git a/gtests/Hlsl.FromFile.cpp b/gtests/Hlsl.FromFile.cpp
index 6e3273c0c5e633080d19267585cce5d890e8328b..abc9e8d4fdbf216c652aa5fdc3564808b11b3558 100644
--- a/gtests/Hlsl.FromFile.cpp
+++ b/gtests/Hlsl.FromFile.cpp
@@ -216,6 +216,7 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.samplelevel.offset.dx10.frag", "main"},
{"hlsl.samplelevel.offsetarray.dx10.frag", "main"},
{"hlsl.sample.sub-vec4.dx10.frag", "main"},
+ {"hlsl.scalar-length.frag", "main"},
{"hlsl.semicolons.frag", "main"},
{"hlsl.shapeConv.frag", "main"},
{"hlsl.shapeConvRet.frag", "main"},
diff --git a/hlsl/hlslParseables.cpp b/hlsl/hlslParseables.cpp
index 1a47a0bb65efd6d43a8fe798192858116f32f6f6..c77b541470268f9c93f1e45a4d0094f9df379bd5 100755
--- a/hlsl/hlslParseables.cpp
+++ b/hlsl/hlslParseables.cpp
@@ -359,7 +359,7 @@ inline bool IsValid(const char* cname, char retOrder, char retType, char argOrde
const std::string name(cname);
// these do not have vec1 versions
- if (dim0 == 1 && (name == "length" || name == "normalize" || name == "reflect" || name == "refract"))
+ if (dim0 == 1 && (name == "normalize" || name == "reflect" || name == "refract"))
return false;
if (!IsTextureType(argOrder) && (isVec && dim0 == 1)) // avoid vec1
@@ -625,7 +625,7 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
{ "isinf", nullptr, "B" , "SVM", "F", EShLangAll, false },
{ "isnan", nullptr, "B" , "SVM", "F", EShLangAll, false },
{ "ldexp", nullptr, nullptr, "SVM,", "F,", EShLangAll, false },
- { "length", "S", "F", "V", "F", EShLangAll, false },
+ { "length", "S", "F", "SV", "F", EShLangAll, false },
{ "lerp", nullptr, nullptr, "VM,,", "F,,", EShLangAll, false },
{ "lerp", nullptr, nullptr, "SVM,,S", "F,,", EShLangAll, false },
{ "lit", "V4", "F", "S,,", "F,,", EShLangAll, false },