Merge pull request #659 from steve-lunarg/d3dcolortoubyte4

author John Kessenich <johnkslang@users.noreply.github.com>

Tue, 3 Jan 2017 22:34:33 +0000 (15:34 -0700)

committer GitHub <noreply@github.com>

Tue, 3 Jan 2017 22:34:33 +0000 (15:34 -0700)
author John Kessenich <johnkslang@users.noreply.github.com>
Tue, 3 Jan 2017 22:34:33 +0000 (15:34 -0700)
committer GitHub <noreply@github.com>
Tue, 3 Jan 2017 22:34:33 +0000 (15:34 -0700)
diff --cc Test/baseResults/hlsl.intrinsics.negative.frag.out
Simple merge
diff --cc gtests/Hlsl.FromFile.cpp
Simple merge
diff --cc hlsl/hlslParseHelper.cpp
Simple merge
diff --cc hlsl/hlslParseables.cpp
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Tue, 3 Jan 2017 22:34:33 +0000 (15:34 -0700)
committer	GitHub <noreply@github.com>
	Tue, 3 Jan 2017 22:34:33 +0000 (15:34 -0700)
		1	2
Test/baseResults/hlsl.intrinsics.negative.frag.out	patch \|	diff1 \|	diff2 \|	blob \| history
gtests/Hlsl.FromFile.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
hlsl/hlslParseHelper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
hlsl/hlslParseables.cpp	patch \|	diff1 \|	diff2 \|	blob \| history