Roll ANGLE.

BUG=skia:2272

Committed: http://code.google.com/p/skia/source/detail?r=14243

R=bsalomon@chromium.org, bsalomon@google.com

Author: geofflang@chromium.org

Review URL: https://codereview.chromium.org/237173002

git-svn-id: http://skia.googlecode.com/svn/trunk@14509 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/DEPS b/DEPS
index 55713a8..eafe046 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -10,8 +10,7 @@ use_relative_paths = True
 deps = {
   # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205199
   # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279)
-  "third_party/externals/angle" : "https://chromium.googlesource.com/external/angleproject.git",
-  "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@bdc9b2f0ed9e365bf5a4d19799d93a512f07dd32",
+  "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@cebb5aa092f92e1f727fe5e4300dbd83abd49afb",
   "third_party/externals/fontconfig" : "https://skia.googlesource.com/third_party/fontconfig.git@2.11.0",
   "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",
   "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@5917c6a6b77c9e97a0cbb66847194381bd36ec4c",

diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index c57a0cc..7148d05 100644 (file)
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -41,3 +41,20 @@ canvas-layer-state
 # humper: https://codereview.chromium.org/248613004/
 # Changed the test in a few ways, will need rebaselining.
 simpleblurroundrect
+
+# geofflang: https://codereview.chromium.org/237173002
+# Rolling to the new version of ANGLE causes slight differences in some tests
+texture_domain_effect
+filterbitmap_image_mandrill_512.png
+filterbitmap_image_mandrill_256.png
+filterbitmap_image_mandrill_128.png
+filterbitmap_image_mandrill_64.png
+filterbitmap_image_mandrill_32.png
+filterbitmap_image_mandrill_16.png
+filterbitmap_text_7.00pt
+filterbitmap_text_3.00pt
+downsamplebitmap_image_medium_mandrill_512.png
+downsamplebitmap_text_medium_72.00pt
+downsamplebitmap_image_high_mandrill_512.png
+downsamplebitmap_text_high_72.00pt
+bitmapsource

diff --git a/gyp/angle.gyp b/gyp/angle.gyp
index 616de1e..467c7fb 100644 (file)
--- a/gyp/angle.gyp
+++ b/gyp/angle.gyp
@@ -1,43 +1,6 @@
-# ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9
+# ANGLE is the Windows-specific translator from OGL ES to D3D
 
 {
-  'conditions': [
-    [ 'skia_angle', {
-      'target_defaults': {
-        'include_dirs': [
-          '$(DXSDK_DIR)/Include',
-        ],
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'conditions': [
-              [ 'skia_arch_width == 32 ', {
-                'AdditionalLibraryDirectories': [
-                  '$(DXSDK_DIR)/Lib/x86',
-                ],
-              },{
-                'AdditionalLibraryDirectories': [
-                  '$(DXSDK_DIR)/Lib/x64',
-                ],
-              }],
-            ],
-          },
-        },
-        'defines': [
-          'NOMINMAX',
-        ],
-        'defines/': [
-          ['exclude', 'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'],
-        ],
-      },
-      'variables': {
-        'component': 'static_library',
-        'skia_warnings_as_errors': 0,
-      },
-      'includes': [
-        '../third_party/externals/angle/src/build_angle.gypi',
-      ],
-    }],
-  ],
   'targets': [
     {
       'target_name': 'angle',
@@ -46,9 +9,13 @@
         [ 'skia_angle', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '../third_party/externals/angle/include',
+              '../third_party/externals/angle2/include',
             ],
           },
+          'dependencies': [
+            '../third_party/externals/angle2/src/angle.gyp:libEGL',
+            '../third_party/externals/angle2/src/angle.gyp:libGLESv2',
+          ],
         }],
       ],
     },

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index e89d116..39ee953 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -22,6 +22,7 @@
           'GR_GL_FUNCTION_TYPE=__stdcall',
         ],
         'msvs_cygwin_shell': 0,
+        'msvs_disabled_warnings': [4275],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'WarningLevel': '3',