Commit 67a017f4 by Jamie Madill Committed by Commit Bot

Checkout GLES 1.1 conformance from DEPS.

This follows a pattern in Chromium where they are slowly removing src-internal and moving to the public DEPS. Also removes the angle-internal dependency and removes the folder from .gitignore so developers can clean it up. Bug: angleproject:3993 Change-Id: I51a169fbff5bf629f03038c0870873cf9f5e3863 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1853888 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 32bee0fd
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
.cipd .cipd
.gclient .gclient
.gclient_entries .gclient_entries
/angle-internal
/src/tests/third_party/gles_conformance_tests /src/tests/third_party/gles_conformance_tests
/testing /testing
/third_party/cherry /third_party/cherry
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
vars = { vars = {
'android_git': 'https://android.googlesource.com', 'android_git': 'https://android.googlesource.com',
'chromium_git': 'https://chromium.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com',
'chrome_internal_git': 'https://chrome-internal.googlesource.com',
'swiftshader_git': 'https://swiftshader.googlesource.com', 'swiftshader_git': 'https://swiftshader.googlesource.com',
# This variable is set on the Chrome infra for compatiblity with gclient. # This variable is set on the Chrome infra for compatiblity with gclient.
...@@ -13,8 +14,9 @@ vars = { ...@@ -13,8 +14,9 @@ vars = {
# This variable is overrided in Chromium's DEPS file. # This variable is overrided in Chromium's DEPS file.
'build_with_chromium': False, 'build_with_chromium': False,
# By default, do not check out angle-internal. This can be overridden e.g. with custom_vars. # Only check out public sources by default. This can be overridden with custom_vars.
# We overload Chromium's 'src-internal' for infra simplicity. # We overload Chromium's 'src-internal' for simplicity.
# TOOD(ynovikov): Use checkout_angle_internal custom variable instead.
'checkout_src_internal': False, 'checkout_src_internal': False,
# Current revision of dEQP. # Current revision of dEQP.
...@@ -44,11 +46,6 @@ vars = { ...@@ -44,11 +46,6 @@ vars = {
deps = { deps = {
'{angle_root}/angle-internal': {
'url': 'https://chrome-internal.googlesource.com/angle/angle-internal.git@f682552d8131422e91f45661a7af83e885ff70ce',
'condition': 'checkout_src_internal',
},
'{angle_root}/build': { '{angle_root}/build': {
'url': '{chromium_git}/chromium/src/build.git@fd0d28db8039e2aaf9fa35e53e3af6dc9ead8055', 'url': '{chromium_git}/chromium/src/build.git@fd0d28db8039e2aaf9fa35e53e3af6dc9ead8055',
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
...@@ -79,6 +76,12 @@ deps = { ...@@ -79,6 +76,12 @@ deps = {
'condition': 'checkout_fuchsia and not build_with_chromium', 'condition': 'checkout_fuchsia and not build_with_chromium',
}, },
# Closed-source OpenGL ES 1.1 Conformance tests.
'{angle_root}/third_party/gles1_conform': {
'url': '{chrome_internal_git}/angle/es-cts.git@dc9f502f709c9cd88d7f8d3974f1c77aa246958e',
'condition': 'checkout_src_internal',
},
# glmark2 is a GPL3-licensed OpenGL ES 2.0 benchmark. We use it for testing. # glmark2 is a GPL3-licensed OpenGL ES 2.0 benchmark. We use it for testing.
'{angle_root}/third_party/glmark2/src': { '{angle_root}/third_party/glmark2/src': {
'url': '{chromium_git}/external/github.com/glmark2/glmark2@9e01aef1a786b28aca73135a5b00f85c357e8f5e', 'url': '{chromium_git}/external/github.com/glmark2/glmark2@9e01aef1a786b28aca73135a5b00f85c357e8f5e',
...@@ -350,9 +353,6 @@ hooks = [ ...@@ -350,9 +353,6 @@ hooks = [
] ]
recursedeps = [ recursedeps = [
# angle-internal has its own DEPS file to pull additional internal repos
'{angle_root}/angle-internal',
# buildtools provides clang_format. # buildtools provides clang_format.
'{angle_root}/buildtools', '{angle_root}/buildtools',
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment