diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-05-24 14:50:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-24 19:45:49 +0000 |
| commit | ef839a96ff92a2bd96b1f21719f239565f91e96f (patch) | |
| tree | 97b57bdd63e9443fab83aad7ce2cd896734745fd /infra | |
| parent | 30f64e4512e05c779ebf3d56f98309eeea9e3755 (diff) | |
Use EGL and GLES headers from Khronos.
Bug: skia:7671
Change-Id: Idae96b08f02768f180c7223bdcddb4dead3a5a1b
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/123588
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/recipe_modules/build/default.py | 7 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py index da96dc9e60..5aba543f19 100644 --- a/infra/bots/recipe_modules/build/default.py +++ b/infra/bots/recipe_modules/build/default.py @@ -146,9 +146,10 @@ def compile_fn(api, checkout_root, out_dir): args['skia_use_egl'] = 'true' extra_cflags.extend([ '-DGR_EGL_TRY_GLES3_THEN_GLES2', - # TODO(dogben): Use headers from Khronos rather than SwiftShader's - # copy. - '-I%s' % swiftshader_root.join('include'), + '-I%s' % skia_dir.join( + 'third_party', 'externals', 'egl-registry', 'api'), + '-I%s' % skia_dir.join( + 'third_party', 'externals', 'opengl-registry', 'api'), ]) extra_ldflags.extend([ '-L%s' % swiftshader_out, diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json index 700d2b2012..b1a541cfa4 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json @@ -79,7 +79,7 @@ "[START_DIR]/cache/work/skia/bin/gn", "gen", "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/swiftshader/include\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out\"] is_debug=false skia_use_egl=true target_cpu=\"x86_64\"" + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out\"] is_debug=false skia_use_egl=true target_cpu=\"x86_64\"" ], "cwd": "[START_DIR]/cache/work/skia", "env": { |