aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar brianosman <brianosman@google.com>2016-08-26 10:37:57 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-26 10:37:57 -0700
commite3031b607c7816980d13a3805382afb403fdfa04 (patch)
tree7d11153a9e137e20dfc280c966d020977a6ed221 /gyp
parent30afa71dd3812a743cace33aa9e41f7446d6c929 (diff)
Update ANGLE to latest as of August 25, 2016
With this version, it's now exposing GL_EXT_color_buffer_half_float, but it's (incorrectly) using GL_HALF_FLOAT rather than GL_HALF_FLOAT_OES. In addition, release builds were crashing in EGLImageTest due to an apparent disagreement about calling convention on function-pointer to exported symbol. There is a proper typedef for that in one of their headers, but I can't seem to include it without creating more problems, so I just fixed the decoration on our local typedef. With those changes, all tests pass, and (on my Windows machine), all GMs and SKPs produce identical results vs. master in angle and angle-gl. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2282733003 Review-Url: https://codereview.chromium.org/2282733003
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_variables.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 68d5072a32..45885947dc 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -75,6 +75,7 @@
'arm_version%': '<(arm_version)',
'arm_neon%': '<(arm_neon)',
'skia_egl%': '<(skia_egl)',
+ 'use_ozone%': 0, # ANGLE requires this to be defined.
'vulkan_merged_into_skia%': '<(vulkan_merged_into_skia)',
'conditions': [
[ 'skia_android_framework == 1', {