Remove highp float FBO dfd*() tests from mustpass

Bug: 22628471
Bug: 22632003
Change-Id: Ia9d2b9a5e04ad317cbcc8782c9efaeedd94a0a58
diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 77155ab..0129078 100644
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -49657,14 +49657,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="float_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 							<Test name="vec2_lowp">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -49681,14 +49673,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="vec2_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 							<Test name="vec3_lowp">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -49705,14 +49689,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="vec3_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 							<Test name="vec4_lowp">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -49729,14 +49705,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="vec4_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 						</TestCase>
 						<TestSuite name="fastest">
 							<TestCase name="default">
@@ -49822,14 +49790,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="float_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec2_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -49846,14 +49806,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec2_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec3_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -49870,14 +49822,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec3_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec4_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -49894,14 +49838,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec4_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 							</TestCase>
 						</TestSuite>
 						<TestSuite name="nicest">
@@ -49988,14 +49924,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="float_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec2_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -50012,14 +49940,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec2_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec3_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -50036,14 +49956,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec3_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec4_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -50060,14 +49972,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec4_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 							</TestCase>
 						</TestSuite>
 						<TestSuite name="texture">
@@ -51079,14 +50983,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="float_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 							<Test name="vec2_lowp">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51103,14 +50999,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="vec2_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 							<Test name="vec3_lowp">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51127,14 +51015,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="vec3_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 							<Test name="vec4_lowp">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51151,14 +51031,6 @@
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="vec4_highp">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-								<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-							</Test>
 						</TestCase>
 						<TestSuite name="fastest">
 							<TestCase name="default">
@@ -51244,14 +51116,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="float_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec2_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51268,14 +51132,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec2_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec3_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51292,14 +51148,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec3_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec4_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51316,14 +51164,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec4_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 							</TestCase>
 						</TestSuite>
 						<TestSuite name="nicest">
@@ -51410,14 +51250,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="float_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec2_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51434,14 +51266,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec2_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec3_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51458,14 +51282,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec3_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 								<Test name="vec4_lowp">
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
@@ -51482,14 +51298,6 @@
 									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
 									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
 								</Test>
-								<Test name="vec4_highp">
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="0" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="90" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="180" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms0" rotation="270" surfacetype="window"/>
-									<TestInstance glconfig="rgba8888d24s8ms4" rotation="unspecified" surfacetype="window"/>
-								</Test>
 							</TestCase>
 						</TestSuite>
 						<TestSuite name="texture">
diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 7cbf3d5..0af09e9 100644
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -16084,16 +16084,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec2_mediump
@@ -16104,16 +16100,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec2_mediump
@@ -16124,16 +16116,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.vec2_mediump
@@ -16256,16 +16244,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec2_mediump
@@ -16276,16 +16260,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec2_mediump
@@ -16296,16 +16276,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-multisample.txt b/android/cts/master/gles3-multisample.txt
index 3916c49..0b258c7 100644
--- a/android/cts/master/gles3-multisample.txt
+++ b/android/cts/master/gles3-multisample.txt
@@ -167,16 +167,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec2_mediump
@@ -187,16 +183,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec2_mediump
@@ -207,16 +199,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.vec2_mediump
@@ -339,16 +327,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec2_mediump
@@ -359,16 +343,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec2_mediump
@@ -379,16 +359,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-rotate-landscape.txt b/android/cts/master/gles3-rotate-landscape.txt
index 9f701a9..2421fa4 100644
--- a/android/cts/master/gles3-rotate-landscape.txt
+++ b/android/cts/master/gles3-rotate-landscape.txt
@@ -124,16 +124,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec2_mediump
@@ -144,16 +140,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec2_mediump
@@ -164,16 +156,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.vec2_mediump
@@ -296,16 +284,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec2_mediump
@@ -316,16 +300,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec2_mediump
@@ -336,16 +316,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-rotate-portrait.txt b/android/cts/master/gles3-rotate-portrait.txt
index 9f701a9..2421fa4 100644
--- a/android/cts/master/gles3-rotate-portrait.txt
+++ b/android/cts/master/gles3-rotate-portrait.txt
@@ -124,16 +124,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec2_mediump
@@ -144,16 +140,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec2_mediump
@@ -164,16 +156,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.vec2_mediump
@@ -296,16 +284,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec2_mediump
@@ -316,16 +300,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec2_mediump
@@ -336,16 +316,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-rotate-reverse-landscape.txt b/android/cts/master/gles3-rotate-reverse-landscape.txt
index 9f701a9..2421fa4 100644
--- a/android/cts/master/gles3-rotate-reverse-landscape.txt
+++ b/android/cts/master/gles3-rotate-reverse-landscape.txt
@@ -124,16 +124,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec2_mediump
@@ -144,16 +140,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec2_mediump
@@ -164,16 +156,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.vec2_mediump
@@ -296,16 +284,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec2_mediump
@@ -316,16 +300,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec2_mediump
@@ -336,16 +316,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-rotate-reverse-portrait.txt b/android/cts/master/gles3-rotate-reverse-portrait.txt
index 9f701a9..2421fa4 100644
--- a/android/cts/master/gles3-rotate-reverse-portrait.txt
+++ b/android/cts/master/gles3-rotate-reverse-portrait.txt
@@ -124,16 +124,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec2_mediump
@@ -144,16 +140,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec2_mediump
@@ -164,16 +156,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.texture.basic.vec2_mediump
@@ -296,16 +284,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec2_mediump
@@ -316,16 +300,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec2_mediump
@@ -336,16 +316,12 @@
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.default.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdy.texture.basic.vec2_mediump
diff --git a/android/cts/master/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt
index bbec40d..59acf5c 100644
--- a/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@ -96,3 +96,7 @@
 
 # Bug 22405868
 dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler3d_float_vertex
+
+# Bug 22628471
+dEQP-GLES3.functional.shaders.derivate.dfdx.*_float.*_highp
+dEQP-GLES3.functional.shaders.derivate.dfdy.*_float.*_highp