Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts...

author Ian Romanick <ian.d.romanick@intel.com>

Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
author Ian Romanick <ian.d.romanick@intel.com>
Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
diff --cc modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp
Simple merge
diff --cc modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp
Simple merge
diff --cc modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp
Simple merge
author	Ian Romanick <ian.d.romanick@intel.com>
	Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
		1	2
modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history