Roll dEQP 9b4161..554adf1.

Includes some tests for EXT_debug_marker https://android.googlesource.com/platform/external/deqp/+log/9b4161..554adf1 BUG=None Change-Id: I911fcb5577caefaa1fe3479445146a2b3f819124 Reviewed-on: https://chromium-review.googlesource.com/277140Reviewed-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Kenneth Russell <kbr@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Roll dEQP 9b4161..554adf1.
e9e4c7f7 · Jamie Madill · 3f6096b7 · e9e4c7f7 · e9e4c7f7 · e9e4c7f7
Commit e9e4c7f7 authored Jun 12, 2015 by Jamie Madill
5 changed files
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@ deps = {
      "http://chromium.googlesource.com/external/googlemock.git@b2cb211e49d872101d991201362d7b97d7d69910",
  "src/tests/third_party/deqp":
-      "https://android.googlesource.com/platform/external/deqp@9b4161daf7defa4d0ee7e88df886b284d1becf43",
+      "https://android.googlesource.com/platform/external/deqp@554adf152573fb579d0cbc68d3c1395e5ee94391",
  "src/tests/third_party/libpng":
      "https://android.googlesource.com/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c",

--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -105,6 +105,8 @@
            '<(deqp_dir)/modules/gles2/functional/es2fClippingTests.hpp',
            '<(deqp_dir)/modules/gles2/functional/es2fColorClearTest.cpp',
            '<(deqp_dir)/modules/gles2/functional/es2fColorClearTest.hpp',
+            '<(deqp_dir)/modules/gles2/functional/es2fDebugMarkerTests.cpp',
+            '<(deqp_dir)/modules/gles2/functional/es2fDebugMarkerTests.hpp',
            '<(deqp_dir)/modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp',
            '<(deqp_dir)/modules/gles2/functional/es2fDefaultVertexAttributeTests.hpp',
            '<(deqp_dir)/modules/gles2/functional/es2fDepthRangeTests.cpp',

--- a/src/tests/deqp_support/dEQP-GLES2-cases.txt.gz
+++ b/src/tests/deqp_support/dEQP-GLES2-cases.txt.gz
--- a/src/tests/deqp_support/dEQP-GLES3-cases.txt.gz
+++ b/src/tests/deqp_support/dEQP-GLES3-cases.txt.gz
--- a/src/tests/deqp_support/deqp_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_test_expectations.txt
@@ -28,6 +28,8 @@
 // TODO(jmadill): triage these into temporary and permananet suppressions
 989 WIN : dEQP-GLES2.functional.shaders.preprocessor.basic.identifier_with_double_underscore_vertex = FAIL
 989 WIN : dEQP-GLES2.functional.shaders.preprocessor.basic.identifier_with_double_underscore_fragment = FAIL
+989 WIN : dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_* = FAIL
+989 WIN : dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_unrecognized_* = FAIL
 989 WIN : dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_vertex = FAIL
 989 WIN : dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_fragment = FAIL
 989 WIN : dEQP-GLES2.functional.shaders.preprocessor.conditional_inclusion.basic_2_vertex = FAIL