[RESTRICT AUTOMERGE] Remove line expression tests
Using #line directive with an expression is considered as undefined
behaviour. Thus, remove these tests.
Removed:
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_expression_fragment
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_expression_vertex
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_expression_fragment
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_expression_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_vertex
Components: OpenGL
VK-GL-CTS issue: 1145
Google bug: b/146024257
(Cherry-picked from 4ff5a922a15bcdb93e59313221033bee1204be2c)
Change-Id: Ib8cb58a8e712397114eb33d8d36c1957b3f5e9b0
diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 34f8f3f..a1f999e 100644
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -1122,10 +1122,6 @@
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_fragment
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_vertex
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_fragment
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_vertex
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_1_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_1_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_2_vertex
diff --git a/android/cts/master/src/gles2-failures.txt b/android/cts/master/src/gles2-failures.txt
index 3d4e7c6..86cc14b 100644
--- a/android/cts/master/src/gles2-failures.txt
+++ b/android/cts/master/src/gles2-failures.txt
@@ -1882,16 +1882,12 @@
dEQP-GLES2.functional.shaders.preprocessor.builtin.invalid_line_file_1_vertex
dEQP-GLES2.functional.shaders.preprocessor.builtin.invalid_line_file_3_fragment
dEQP-GLES2.functional.shaders.preprocessor.builtin.invalid_line_file_3_vertex
-dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_expression_fragment
-dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_expression_vertex
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_fragment
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_vertex
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_1_fragment
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_1_vertex
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_2_fragment
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_2_vertex
-dEQP-GLES2.functional.shaders.preprocessor.builtin.line_expression_fragment
-dEQP-GLES2.functional.shaders.preprocessor.builtin.line_expression_vertex
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_fragment
dEQP-GLES2.functional.shaders.preprocessor.builtin.line_vertex
dEQP-GLES2.functional.shaders.preprocessor.conditional_inclusion.unary_ops_2_fragment
diff --git a/android/cts/nyc/gles3-master.txt b/android/cts/nyc/gles3-master.txt
index 6b535ab..48857d3 100644
--- a/android/cts/nyc/gles3-master.txt
+++ b/android/cts/nyc/gles3-master.txt
@@ -1122,10 +1122,6 @@
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_fragment
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_vertex
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_fragment
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_vertex
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_1_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_1_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_2_vertex
diff --git a/android/cts/nyc/src/gles3-master.txt b/android/cts/nyc/src/gles3-master.txt
index 6b535ab..48857d3 100644
--- a/android/cts/nyc/src/gles3-master.txt
+++ b/android/cts/nyc/src/gles3-master.txt
@@ -1122,10 +1122,6 @@
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_fragment
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_vertex
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_expression_fragment
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_vertex
-dEQP-GLES3.functional.shaders.preprocessor.builtin.line_and_file_expression_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_1_vertex
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_1_fragment
dEQP-GLES3.functional.shaders.preprocessor.builtin.line_defined_2_vertex
diff --git a/data/gles2/shaders/preprocessor.test b/data/gles2/shaders/preprocessor.test
index 139e883..f4048ce 100644
--- a/data/gles2/shaders/preprocessor.test
+++ b/data/gles2/shaders/preprocessor.test
@@ -2532,34 +2532,6 @@
""
end
- case line_expression
- values { output float out0 = 20.0; }
- both ""
- precision mediump float;
- ${DECLARATIONS}
- void main()
- {
- #line +20
- out0 = float(__LINE__);
- ${OUTPUT}
- }
- ""
- end
-
- case line_and_file_expression
- values { output vec4 out0 = vec4(243.0, 243.0, 10.0, 10.0); }
- both ""
- precision mediump float;
- ${DECLARATIONS}
- void main()
- {
- #line (233 +10) (+10)
- out0 = vec4(__LINE__, __LINE__, __FILE__, __FILE__);
- ${OUTPUT}
- }
- ""
- end
-
case line_defined_1
values { output float out0 = 4.0; }
both ""
diff --git a/data/gles3/shaders/preprocessor.test b/data/gles3/shaders/preprocessor.test
index 1e2d4f1..f290c1e 100644
--- a/data/gles3/shaders/preprocessor.test
+++ b/data/gles3/shaders/preprocessor.test
@@ -3192,38 +3192,6 @@
""
end
- case line_expression
- version 300 es
- values { output float out0 = 20.0; }
- both ""
- #version 300 es
- precision mediump float;
- ${DECLARATIONS}
- void main()
- {
- #line +20
- out0 = float(__LINE__);
- ${OUTPUT}
- }
- ""
- end
-
- case line_and_file_expression
- version 300 es
- values { output vec4 out0 = vec4(243.0, 243.0, 10.0, 10.0); }
- both ""
- #version 300 es
- precision mediump float;
- ${DECLARATIONS}
- void main()
- {
- #line (233 +10) (+10)
- out0 = vec4(__LINE__, __LINE__, __FILE__, __FILE__);
- ${OUTPUT}
- }
- ""
- end
-
case line_defined_1
version 300 es
values { output float out0 = 4.0; }
