From ab56367cfc555d232d54efcc5c9399d5fedcdd8f Mon Sep 17 00:00:00 2001 From: James Robinson Date: Fri, 28 Aug 2015 10:11:45 -0700 Subject: [PATCH] Remove //gpu and GLES* headers from third_party/khronos This gets rid of the rest of the files in //gpu and the GLES{2,3} headers from //third_party/khronos. The GL headers used for GLES{2,3} come from the platform being targetted, that is //mojo/public/c/gpu/GLES2 for Mojo, //third_party/android_tools/ndk/platforms/android-XX/usr/include/GLES2 for Android and the OpenGL framework for Mac/iOS. The //third_party/khronos/EGL headers are still being used by some utility code in //ui/gl. This code is only really useful on Android, as Sky doesn't use EGL on iOS/Mac/Mojo, but it's compiled in on all platforms currently and relies on some EGL defines that are not set in the EGL headers we currently use. These could probably be removed without much trouble. The //third_party/khronos/GLES2 headers are still used by some of //ui/gl on iOS. These should be using the iOS OpenGL framework headers, and will in the future. Removes the unneeded KHRONOS_APICALL override from KHR/khrplatform.h Rolls to a newer Mojo SDK that doesn't expect //third_party/khronos --- DEPS | 2 +- engine/src/flutter/sky/tools/roll/roll.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 8da37fe82d..fa79a87475 100644 --- a/DEPS +++ b/DEPS @@ -19,7 +19,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'mojo_sdk_revision': 'f9c33d6eb1106c0f9edbbfb607da94fb76245238', + 'mojo_sdk_revision': 'f278a714f0508fa74bd5ea345f2944740ea5b035', 'mojo_devtools_revision': '2feda37728d3e551ef543b8f6c4f4b20eaa2d81f', 'skia_revision': '6904d1d3f1a2903fcaa4c4bd17b07d5f10af2e8e', 'dart_revision': 'cab003366785773ace16b5305ac1f33c228cac54', diff --git a/engine/src/flutter/sky/tools/roll/roll.py b/engine/src/flutter/sky/tools/roll/roll.py index b39f327902..4c9c8f1bdd 100755 --- a/engine/src/flutter/sky/tools/roll/roll.py +++ b/engine/src/flutter/sky/tools/roll/roll.py @@ -53,7 +53,6 @@ _third_party_deps = [ 'third_party/jinja2', 'third_party/jsr-305', 'third_party/junit', - 'third_party/khronos', 'third_party/libjpeg', 'third_party/libpng', 'third_party/libXNVCtrl',