diff options
| author |  hendrikw <hendrikw@chromium.org> | 2015-07-21 14:50:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-21 14:50:08 -0700 |
| commit | 10b371c6e376f1f3eba88ac4bfdf34652f3ab1dc (patch) | |
| tree | b15e747208489af805d786d0841c03d59a8e4158 | |
| parent | b7069e9c1f65d11f9581be0adbffa968257afc33 (diff) | |
ANGLE deps roll
If we ever want to allow the command buffer as a skia gles2 backend,
we need a more up to date version of ANGLE, specifically there are
4 defines that differ between newer and older versions of ANGLE which
we use in skia, I've updated these in this change.
I'm not quite sure if what I've done for the 'angle_path' is correct,
I tried setting it to a path relative to skia, and to '<(DEPTH)', both
of which do not compile correctly, only '../' worked.
Committed: https://skia.googlesource.com/skia/+/db0b1e796ddbd08e6be8a666537318b1c0e2ce56
Review URL: https://codereview.chromium.org/1244843003
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 1 | ||||
| -rw-r--r-- | src/gpu/gl/angle/SkANGLEGLContext.cpp | 8 |
3 files changed, 6 insertions, 5 deletions
@@ -8,7 +8,7 @@ deps = { # There is some duplication here that might be worth cleaning up: # - can use use our existing t_p/e/libjpeg instead of pulling it for Android? - "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@c415283b2bcd786e1a8c55c19ef3511eb2b3928c", + "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@01c796ac8e363ae953797f9cf316ec17dc477e87", "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@08429da7955a98ef764fafa223dd7de73f654b2d", "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35", diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index dd6465325e..10b465ac8e 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -36,6 +36,7 @@ # which deals with these same constraints in a similar manner. # 'variables': { # level 1 + 'angle_path%': '../', 'variables': { # level 2 # Variables needed by conditions list within the level-2 variables dict. diff --git a/src/gpu/gl/angle/SkANGLEGLContext.cpp b/src/gpu/gl/angle/SkANGLEGLContext.cpp index f6321988aa..fec23e63e8 100644 --- a/src/gpu/gl/angle/SkANGLEGLContext.cpp +++ b/src/gpu/gl/angle/SkANGLEGLContext.cpp @@ -10,10 +10,10 @@ #include <EGL/egl.h> -#define EGL_PLATFORM_ANGLE_ANGLE 0x3201 -#define EGL_PLATFORM_ANGLE_TYPE_ANGLE 0x3202 -#define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE 0x3206 -#define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE 0x3207 +#define EGL_PLATFORM_ANGLE_ANGLE 0x3202 +#define EGL_PLATFORM_ANGLE_TYPE_ANGLE 0x3203 +#define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE 0x3207 +#define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE 0x3208 void* SkANGLEGLContext::GetD3DEGLDisplay(void* nativeDisplay) { |