Merge vk-gl-cts/opengl-es-cts-3.2.7 into vk-gl-cts/opengl-es-cts-3.2.8

author Matthew Netsch <quic_mnetsch@quicinc.com>

Thu, 2 Jun 2022 20:51:45 +0000 (20:51 +0000)

committer Matthew Netsch <quic_mnetsch@quicinc.com>

Thu, 2 Jun 2022 20:51:45 +0000 (20:51 +0000)
author Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 2 Jun 2022 20:51:45 +0000 (20:51 +0000)
committer Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 2 Jun 2022 20:51:45 +0000 (20:51 +0000)
diff --cc modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp
Simple merge
diff --cc modules/gles31/functional/es31fTextureMultisampleTests.cpp
Simple merge
author	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 2 Jun 2022 20:51:45 +0000 (20:51 +0000)
committer	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 2 Jun 2022 20:51:45 +0000 (20:51 +0000)
		1	2
modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/gles31/functional/es31fTextureMultisampleTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history