Merge pull request #1792 from Roy-AMD/automapping-opengl-location

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

Tue, 23 Jul 2019 08:18:18 +0000 (02:18 -0600)

committer GitHub <noreply@github.com>

Tue, 23 Jul 2019 08:18:18 +0000 (02:18 -0600)
author John Kessenich <johnkslang@users.noreply.github.com>
Tue, 23 Jul 2019 08:18:18 +0000 (02:18 -0600)
committer GitHub <noreply@github.com>
Tue, 23 Jul 2019 08:18:18 +0000 (02:18 -0600)
diff --cc glslang/MachineIndependent/ShaderLang.cpp
Simple merge
diff --cc glslang/Public/ShaderLang.h
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Tue, 23 Jul 2019 08:18:18 +0000 (02:18 -0600)
committer	GitHub <noreply@github.com>
	Tue, 23 Jul 2019 08:18:18 +0000 (02:18 -0600)
		1	2
glslang/MachineIndependent/ShaderLang.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
glslang/Public/ShaderLang.h	patch \|	diff1 \|	diff2 \|	blob \| history