From 3bca299af405f126fab33fa5055b24eed8e62646 Mon Sep 17 00:00:00 2001
From: Kalle Raita <kraita@google.com>
Date: Tue, 11 Aug 2015 16:41:47 -0700
Subject: [PATCH] Remove infeasible derivative.fwidth cases

Bug: 22760309
Change-Id: Idca87ed439b15cfd6c5309711693ef59a5a534f6
---
 android/cts/master/com.drawelements.deqp.gles3.xml | 64 ----------------------
 android/cts/master/gles3-master.txt                |  8 ---
 android/cts/master/gles3-multisample.txt           |  8 ---
 android/cts/master/gles3-rotate-landscape.txt      |  8 ---
 android/cts/master/gles3-rotate-portrait.txt       |  8 ---
 .../cts/master/gles3-rotate-reverse-landscape.txt  |  8 ---
 .../cts/master/gles3-rotate-reverse-portrait.txt   |  8 ---
 android/cts/master/src/gles3-driver-issues.txt     |  8 +++
 8 files changed, 8 insertions(+), 112 deletions(-)

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 46da9f1..355c32d 100644
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -50038,14 +50038,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"/>
@@ -50062,22 +50054,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_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"/>
@@ -50094,14 +50070,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">
@@ -50164,14 +50132,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"/>
@@ -50188,22 +50148,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_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"/>
@@ -50220,14 +50164,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 09324f8..d83ecf5 100644
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -15909,14 +15909,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_mediump
@@ -15924,14 +15920,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-multisample.txt b/android/cts/master/gles3-multisample.txt
index af67d0e..35331e7 100644
--- a/android/cts/master/gles3-multisample.txt
+++ b/android/cts/master/gles3-multisample.txt
@@ -328,14 +328,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_mediump
@@ -343,14 +339,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-rotate-landscape.txt b/android/cts/master/gles3-rotate-landscape.txt
index 57fa05b..35aa19f 100644
--- a/android/cts/master/gles3-rotate-landscape.txt
+++ b/android/cts/master/gles3-rotate-landscape.txt
@@ -286,14 +286,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_mediump
@@ -301,14 +297,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.vec2_mediump
diff --git a/android/cts/master/gles3-rotate-portrait.txt b/android/cts/master/gles3-rotate-portrait.txt
index 57fa05b..35aa19f 100644
--- a/android/cts/master/gles3-rotate-portrait.txt
+++ b/android/cts/master/gles3-rotate-portrait.txt
@@ -286,14 +286,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_mediump
@@ -301,14 +297,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.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 57fa05b..35aa19f 100644
--- a/android/cts/master/gles3-rotate-reverse-landscape.txt
+++ b/android/cts/master/gles3-rotate-reverse-landscape.txt
@@ -286,14 +286,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_mediump
@@ -301,14 +297,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.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 57fa05b..35aa19f 100644
--- a/android/cts/master/gles3-rotate-reverse-portrait.txt
+++ b/android/cts/master/gles3-rotate-reverse-portrait.txt
@@ -286,14 +286,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_mediump
@@ -301,14 +297,10 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec2_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.default.vec4_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.float_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.texture.basic.vec2_mediump
diff --git a/android/cts/master/src/gles3-driver-issues.txt b/android/cts/master/src/gles3-driver-issues.txt
index c00c06c..33c4f62 100644
--- a/android/cts/master/src/gles3-driver-issues.txt
+++ b/android/cts/master/src/gles3-driver-issues.txt
@@ -719,6 +719,14 @@ dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_float.vec3_lowp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_float.vec3_mediump
 dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_float.vec3_highp
 dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_float.vec4_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.float_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec2_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec3_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_float.vec4_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.float_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec2_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec3_highp
+dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_float.vec4_highp
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.coherent_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.coherent_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.atomic_uint_vertex
-- 
2.7.4