Merge pull request #2387 from BNieuwenhuizen/nonuniform

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

Fri, 30 Oct 2020 21:10:11 +0000 (15:10 -0600)

committer GitHub <noreply@github.com>

Fri, 30 Oct 2020 21:10:11 +0000 (15:10 -0600)
author John Kessenich <johnkslang@users.noreply.github.com>
Fri, 30 Oct 2020 21:10:11 +0000 (15:10 -0600)
committer GitHub <noreply@github.com>
Fri, 30 Oct 2020 21:10:11 +0000 (15:10 -0600)
diff --cc SPIRV/GlslangToSpv.cpp
Simple merge
diff --cc SPIRV/SpvBuilder.cpp
Simple merge
diff --cc SPIRV/SpvBuilder.h
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Fri, 30 Oct 2020 21:10:11 +0000 (15:10 -0600)
committer	GitHub <noreply@github.com>
	Fri, 30 Oct 2020 21:10:11 +0000 (15:10 -0600)
		1	2
SPIRV/GlslangToSpv.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
SPIRV/SpvBuilder.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
SPIRV/SpvBuilder.h	patch \|	diff1 \|	diff2 \|	blob \| history