Remove GL_KHR_blend_equation_advanced from rgb565 mustpass.

Bug: 19989766
Change-Id: I9c03bb32e83a404798191ad99ca85203fd75b6af
diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index b33c8d1..6b0abf4 100644
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -46199,77 +46199,62 @@
 					<Test name="multiply">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="screen">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="overlay">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="darken">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="lighten">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="colordodge">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="colorburn">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hardlight">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="softlight">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="difference">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="exclusion">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_hue">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_saturation">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_color">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_luminosity">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 				</TestCase>
 				<TestCase name="srgb">
@@ -46370,154 +46355,124 @@
 					<Test name="multiply">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="screen">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="overlay">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="darken">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="lighten">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="colordodge">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="colorburn">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hardlight">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="softlight">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="difference">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="exclusion">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_hue">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_saturation">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_color">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_luminosity">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 				</TestCase>
 				<TestCase name="coherent">
 					<Test name="multiply">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="screen">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="overlay">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="darken">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="lighten">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="colordodge">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="colorburn">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hardlight">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="softlight">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="difference">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="exclusion">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_hue">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_saturation">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_color">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="hsl_luminosity">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-						<TestInstance glconfig="rgb565d0s0ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 				</TestCase>
 				<TestCase name="coherent_msaa">
diff --git a/android/cts/master/gles31-565-no-depth-no-stencil.txt b/android/cts/master/gles31-565-no-depth-no-stencil.txt
index 444efd6..f46fc1f 100644
--- a/android/cts/master/gles31-565-no-depth-no-stencil.txt
+++ b/android/cts/master/gles31-565-no-depth-no-stencil.txt
@@ -21,48 +21,3 @@
 dEQP-GLES31.functional.shaders.sample_variables.sample_mask.inverse_per_two_samples.default_framebuffer
 dEQP-GLES31.functional.sample_shading.min_sample_shading.default_framebuffer_color
 dEQP-GLES31.functional.sample_shading.min_sample_shading.default_framebuffer_discard
-dEQP-GLES31.functional.blend_equation_advanced.basic.multiply
-dEQP-GLES31.functional.blend_equation_advanced.basic.screen
-dEQP-GLES31.functional.blend_equation_advanced.basic.overlay
-dEQP-GLES31.functional.blend_equation_advanced.basic.darken
-dEQP-GLES31.functional.blend_equation_advanced.basic.lighten
-dEQP-GLES31.functional.blend_equation_advanced.basic.colordodge
-dEQP-GLES31.functional.blend_equation_advanced.basic.colorburn
-dEQP-GLES31.functional.blend_equation_advanced.basic.hardlight
-dEQP-GLES31.functional.blend_equation_advanced.basic.softlight
-dEQP-GLES31.functional.blend_equation_advanced.basic.difference
-dEQP-GLES31.functional.blend_equation_advanced.basic.exclusion
-dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_hue
-dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_saturation
-dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_color
-dEQP-GLES31.functional.blend_equation_advanced.basic.hsl_luminosity
-dEQP-GLES31.functional.blend_equation_advanced.barrier.multiply
-dEQP-GLES31.functional.blend_equation_advanced.barrier.screen
-dEQP-GLES31.functional.blend_equation_advanced.barrier.overlay
-dEQP-GLES31.functional.blend_equation_advanced.barrier.darken
-dEQP-GLES31.functional.blend_equation_advanced.barrier.lighten
-dEQP-GLES31.functional.blend_equation_advanced.barrier.colordodge
-dEQP-GLES31.functional.blend_equation_advanced.barrier.colorburn
-dEQP-GLES31.functional.blend_equation_advanced.barrier.hardlight
-dEQP-GLES31.functional.blend_equation_advanced.barrier.softlight
-dEQP-GLES31.functional.blend_equation_advanced.barrier.difference
-dEQP-GLES31.functional.blend_equation_advanced.barrier.exclusion
-dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_hue
-dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_saturation
-dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_color
-dEQP-GLES31.functional.blend_equation_advanced.barrier.hsl_luminosity
-dEQP-GLES31.functional.blend_equation_advanced.coherent.multiply
-dEQP-GLES31.functional.blend_equation_advanced.coherent.screen
-dEQP-GLES31.functional.blend_equation_advanced.coherent.overlay
-dEQP-GLES31.functional.blend_equation_advanced.coherent.darken
-dEQP-GLES31.functional.blend_equation_advanced.coherent.lighten
-dEQP-GLES31.functional.blend_equation_advanced.coherent.colordodge
-dEQP-GLES31.functional.blend_equation_advanced.coherent.colorburn
-dEQP-GLES31.functional.blend_equation_advanced.coherent.hardlight
-dEQP-GLES31.functional.blend_equation_advanced.coherent.softlight
-dEQP-GLES31.functional.blend_equation_advanced.coherent.difference
-dEQP-GLES31.functional.blend_equation_advanced.coherent.exclusion
-dEQP-GLES31.functional.blend_equation_advanced.coherent.hsl_hue
-dEQP-GLES31.functional.blend_equation_advanced.coherent.hsl_saturation
-dEQP-GLES31.functional.blend_equation_advanced.coherent.hsl_color
-dEQP-GLES31.functional.blend_equation_advanced.coherent.hsl_luminosity
diff --git a/android/cts/master/src/gles31-pixelformat.txt b/android/cts/master/src/gles31-pixelformat.txt
index bb72c23..dabe82a 100644
--- a/android/cts/master/src/gles31-pixelformat.txt
+++ b/android/cts/master/src/gles31-pixelformat.txt
@@ -3,6 +3,3 @@
 dEQP-GLES31.info.*
 dEQP-GLES31.functional.shaders.sample_variables.*.default_framebuffer
 dEQP-GLES31.functional.sample_shading.*.default_framebuffer_*
-dEQP-GLES31.functional.blend_equation_advanced.basic.*
-dEQP-GLES31.functional.blend_equation_advanced.barrier.*
-dEQP-GLES31.functional.blend_equation_advanced.coherent.*