From 424a8a70f59ca19c21229667bdfc808be7f6b999 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Mon, 20 Mar 2017 12:49:50 +0100 Subject: [PATCH] Remove few preprocessor tests from GLES CTS 3.2.3.x Affects: dEQP-GLES2.functional.shaders.preprocessor.* dEQP-GLES3.functional.shaders.preprocessor.* Components: OpenGL VL-GL-CTS issue: 231 Change-Id: I1a48da1e6443c2dff49c51cb6bce6883076c702d --- .../mustpass/gles/aosp_mustpass/3.2.3.x/gles2-master.txt | 14 -------------- .../mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt | 2 -- .../aosp_mustpass/3.2.3.x/src/gles2-driver-issues.txt | 15 +++++++++++++++ .../aosp_mustpass/3.2.3.x/src/gles3-driver-issues.txt | 3 +++ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles2-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles2-master.txt index 2e2eafa..911b0a3 100644 --- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles2-master.txt +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles2-master.txt @@ -143,10 +143,6 @@ dEQP-GLES2.functional.shaders.preprocessor.definitions.define_value_and_function dEQP-GLES2.functional.shaders.preprocessor.definitions.define_value_and_function_fragment dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_object_invalid_syntax_vertex dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_object_invalid_syntax_fragment -dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_1_vertex -dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_1_fragment -dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_2_vertex -dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_2_fragment dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_3_vertex dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_3_fragment dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_4_vertex @@ -189,8 +185,6 @@ dEQP-GLES2.functional.shaders.preprocessor.object_redefinitions.redefine_object_ dEQP-GLES2.functional.shaders.preprocessor.object_redefinitions.redefine_object_comment_fragment dEQP-GLES2.functional.shaders.preprocessor.object_redefinitions.redefine_object_multiline_comment_vertex dEQP-GLES2.functional.shaders.preprocessor.object_redefinitions.redefine_object_multiline_comment_fragment -dEQP-GLES2.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_vertex -dEQP-GLES2.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_fragment dEQP-GLES2.functional.shaders.preprocessor.comments.multiline_comment_define_vertex dEQP-GLES2.functional.shaders.preprocessor.comments.multiline_comment_define_fragment dEQP-GLES2.functional.shaders.preprocessor.comments.nested_comment_vertex @@ -277,8 +271,6 @@ dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.gl_es_2_vertex dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.gl_es_2_fragment dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_1_vertex dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_1_fragment -dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_vertex -dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_fragment dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.file_vertex dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.file_fragment dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.if_gl_es_vertex @@ -445,16 +437,12 @@ dEQP-GLES2.functional.shaders.preprocessor.directive.error_with_no_tokens_vertex dEQP-GLES2.functional.shaders.preprocessor.directive.error_with_no_tokens_fragment dEQP-GLES2.functional.shaders.preprocessor.directive.error_vertex dEQP-GLES2.functional.shaders.preprocessor.directive.error_fragment -dEQP-GLES2.functional.shaders.preprocessor.builtin.line_vertex -dEQP-GLES2.functional.shaders.preprocessor.builtin.line_fragment dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_vertex dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_fragment dEQP-GLES2.functional.shaders.preprocessor.builtin.line_expression_vertex dEQP-GLES2.functional.shaders.preprocessor.builtin.line_expression_fragment dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_expression_vertex dEQP-GLES2.functional.shaders.preprocessor.builtin.line_and_file_expression_fragment -dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_1_vertex -dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_1_fragment dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_2_vertex dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_2_fragment dEQP-GLES2.functional.shaders.preprocessor.builtin.empty_line_vertex @@ -497,8 +485,6 @@ dEQP-GLES2.functional.shaders.preprocessor.extensions.invalid_char_in_behavior_v dEQP-GLES2.functional.shaders.preprocessor.extensions.invalid_char_in_behavior_fragment dEQP-GLES2.functional.shaders.preprocessor.extensions.unterminated_comment_vertex dEQP-GLES2.functional.shaders.preprocessor.extensions.unterminated_comment_fragment -dEQP-GLES2.functional.shaders.preprocessor.extensions.after_non_preprocessing_tokens_vertex -dEQP-GLES2.functional.shaders.preprocessor.extensions.after_non_preprocessing_tokens_fragment dEQP-GLES2.functional.shaders.preprocessor.expressions.shift_left_vertex dEQP-GLES2.functional.shaders.preprocessor.expressions.shift_left_fragment dEQP-GLES2.functional.shaders.preprocessor.expressions.shift_right_vertex diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt index 35819a0..8116bff 100644 --- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt @@ -951,8 +951,6 @@ dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.gl_es_2_vertex dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.gl_es_2_fragment dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.line_1_vertex dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.line_1_fragment -dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.line_2_vertex -dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.line_2_fragment dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.file_vertex dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.file_fragment dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.if_gl_es_vertex diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles2-driver-issues.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles2-driver-issues.txt index e69de29..970dffc 100644 --- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles2-driver-issues.txt +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles2-driver-issues.txt @@ -0,0 +1,15 @@ +#VK-GL-CTS 231 +dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_1_vertex +dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_1_fragment +dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_2_vertex +dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_invalid_object_2_fragment +dEQP-GLES2.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_vertex +dEQP-GLES2.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_fragment +dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_vertex +dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_fragment +dEQP-GLES2.functional.shaders.preprocessor.builtin.line_vertex +dEQP-GLES2.functional.shaders.preprocessor.builtin.line_fragment +dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_1_vertex +dEQP-GLES2.functional.shaders.preprocessor.builtin.line_defined_1_fragment +dEQP-GLES2.functional.shaders.preprocessor.extensions.after_non_preprocessing_tokens_vertex +dEQP-GLES2.functional.shaders.preprocessor.extensions.after_non_preprocessing_tokens_fragment diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-driver-issues.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-driver-issues.txt index e69de29..755f471 100644 --- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-driver-issues.txt +++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-driver-issues.txt @@ -0,0 +1,3 @@ +#VK-GL-CTS 231 +dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.line_2_vertex +dEQP-GLES3.functional.shaders.preprocessor.predefined_macros.line_2_fragment -- 2.7.4