Skip to content

Commit

Permalink
Roll chromium_revision b0410bba02..fb6cbaf6e5 (763000:790363)
Browse files Browse the repository at this point in the history
Also updates a Vulkan back-end file to not return error.

Change log: https://chromium.googlesource.com/chromium/src/+log/b0410bba02..fb6cbaf6e5
Full diff: https://chromium.googlesource.com/chromium/src/+/b0410bba02..fb6cbaf6e5

Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/45ab3c89af..1ee11394cf
* buildtools: https://chromium.googlesource.com/chromium/src/buildtools.git/+log/204a35a2a6..9e121212d4
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/3993ef1f52..f126fc6578
* third_party/Python-Markdown: https://chromium.googlesource.com/chromium/src/third_party/Python-Markdown/+log/36657c103c..9c8566e047
* third_party/googletest: https://chromium.googlesource.com/chromium/src/third_party/googletest/+log/217407c478..defbf92951
* third_party/jsoncpp: https://chromium.googlesource.com/chromium/src/third_party/jsoncpp/+log/{chromium_..ec647b85b6
* third_party/nasm: https://chromium.googlesource.com/chromium/deps/nasm.git/+log/4fa54ca5f7..19f3fad68d
* third_party/zlib: https://chromium.googlesource.com/chromium/src/third_party/zlib/+log/ae385786ed..89bddfee9c
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/04b99e7bf9..6412135b39
* tools/md_browser: https://chromium.googlesource.com/chromium/src/tools/md_browser/+log/aae45d8d82..be8cf5a17d
DEPS diff: https://chromium.googlesource.com/chromium/src/+/b0410bba02..fb6cbaf6e5/DEPS

Clang version changed 4e0d9925d6a3561449bdd8def27fd3f3f1b3fb9f:04b9a46c842f793a2baedcad64de35fcbd3e93b7
Details: https://chromium.googlesource.com/chromium/src/+/b0410bba02..fb6cbaf6e5/tools/clang/scripts/update.py

Bug: angleproject:4867
Change-Id: I184945ad4d1fc39f4ad9b37cbf411b2c2b74a3ab
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2309223
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
  • Loading branch information
null77 authored and Commit Bot committed Jul 21, 2020
1 parent 1cfc6f0 commit 2321158
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 24 deletions.
42 changes: 22 additions & 20 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
use_relative_paths = True
use_relative_hooks = True

gclient_gn_args_file = 'build/config/gclient_args.gni'

vars = {
'android_git': 'https://android.googlesource.com',
'chromium_git': 'https://chromium.googlesource.com',
Expand All @@ -19,7 +21,7 @@ vars = {
'checkout_angle_internal': False,

# Version of Chromium our Chromium-based DEPS are mirrored from.
'chromium_revision': 'b0410bba028cf153be2d02e36b6e99b59fdcb000',
'chromium_revision': 'fb6cbaf6e55fc6aba0a0d7c163526789bbceb808',

# Current revision of VK-GL-CTS (a.k.a dEQP).
'vk_gl_cts_revision': '4b40207be32deac1c567dacc70cde031bea005aa',
Expand Down Expand Up @@ -80,20 +82,30 @@ vars = {
deps = {

'build': {
'url': '{chromium_git}/chromium/src/build.git@45ab3c89af6fc3126b0ca5a7836f0db85ad1ba0e',
'url': '{chromium_git}/chromium/src/build.git@1ee11394cfbea8e22ab5e9192266da38f059ec67',
'condition': 'not build_with_chromium',
},

'buildtools': {
'url': '{chromium_git}/chromium/src/buildtools.git@204a35a2a64f7179f8b76d7a0385653690839e21',
'url': '{chromium_git}/chromium/src/buildtools.git@9e121212d42be62a7cce38072f925f8398d11e49',
'condition': 'not build_with_chromium',
},

'testing': {
'url': '{chromium_git}/chromium/src/testing@3993ef1f527b206d8d3bf3f9824f4fe0e4bbdb0e',
'url': '{chromium_git}/chromium/src/testing@f126fc6578039eb81449c7eeb8a95855bb9b1a42',
'condition': 'not build_with_chromium',
},

'third_party/android_ndk': {
'url': '{chromium_git}/android_ndk.git@27c0a8d090c666a50e40fceb4ee5b40b1a2d3f87',
'condition': 'checkout_android and not build_with_chromium',
},

'third_party/catapult': {
'url': '{chromium_git}/catapult.git@{catapult_revision}',
'condition': 'checkout_android and not build_with_chromium',
},

# Cherry is a dEQP/VK-GL-CTS management GUI written in Go. We use it for viewing test results.
'third_party/cherry': {
'url': '{android_git}/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc',
Expand Down Expand Up @@ -131,7 +143,7 @@ deps = {
},

'third_party/googletest': {
'url': '{chromium_git}/chromium/src/third_party/googletest@217407c4787f361aa5814ec609379bfc9b21d307',
'url': '{chromium_git}/chromium/src/third_party/googletest@defbf92951658959ecb0e06d344fa65eedfc6e7a',
'condition': 'not build_with_chromium',
},

Expand All @@ -152,12 +164,12 @@ deps = {
},

'third_party/nasm': {
'url': '{chromium_git}/chromium/deps/nasm@4fa54ca5f7fc3a15a8c78ac94688e64d3e4e4fa1',
'url': '{chromium_git}/chromium/deps/nasm.git@19f3fad68da99277b2882939d3b2fa4c4b8d51d9',
'condition': 'not build_with_chromium',
},

'third_party/Python-Markdown': {
'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@36657c103ce5964733bbbb29377085e9cc1a9472',
'url': '{chromium_git}/chromium/src/third_party/Python-Markdown@9c8566e04768e32834ac87e0ae78d8793c749a34',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -224,12 +236,12 @@ deps = {
},

'third_party/zlib': {
'url': '{chromium_git}/chromium/src/third_party/zlib@ae385786edb15f57e992c5e9dd9464e376d69399',
'url': '{chromium_git}/chromium/src/third_party/zlib@89bddfee9cf8fde3ab1212ed63bf03d76baf8914',
'condition': 'not build_with_chromium',
},

'tools/clang': {
'url': '{chromium_git}/chromium/src/tools/clang.git@04b99e7bf9160d551c3a5562f583014b6afc90f9',
'url': '{chromium_git}/chromium/src/tools/clang.git@6412135b3979b680c20cf007ab242d968025fc3e',
'condition': 'not build_with_chromium',
},

Expand All @@ -245,24 +257,14 @@ deps = {
},

'tools/md_browser': {
'url': '{chromium_git}/chromium/src/tools/md_browser@aae45d8d82400e90483d4fee2ca3e648f2313cb2',
'url': '{chromium_git}/chromium/src/tools/md_browser@be8cf5a17d73c14170dff2ec9600310483361356',
'condition': 'not build_with_chromium',
},

'tools/memory': {
'url': '{chromium_git}/chromium/src/tools/memory@89552acb6e60f528fe3c98eac7b445d4c34183ee',
'condition': 'not build_with_chromium',
},

'third_party/catapult': {
'url': '{chromium_git}/catapult.git@{catapult_revision}',
'condition': 'checkout_android and not build_with_chromium',
},

'third_party/android_ndk': {
'url': '{chromium_git}/android_ndk.git@27c0a8d090c666a50e40fceb4ee5b40b1a2d3f87',
'condition': 'checkout_android and not build_with_chromium',
},
}

hooks = [
Expand Down
4 changes: 4 additions & 0 deletions build_overrides/build.gni
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ declare_args() {
linux_use_bundled_binutils_override = false

use_system_xcode = ""

# If true, it assumes that //third_party/abseil-cpp is an available
# dependency for googletest.
gtest_enable_absl_printers = false
}

if (host_os == "mac" && use_system_xcode == "") {
Expand Down
5 changes: 5 additions & 0 deletions scripts/roll_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,18 @@ class RollError(Exception):
pass


def StrExpansion():
return lambda str_value: str_value


def VarLookup(local_scope):
return lambda var_name: local_scope['vars'][var_name]


def ParseDepsDict(deps_content):
local_scope = {}
global_scope = {
'Str': StrExpansion(),
'Var': VarLookup(local_scope),
'deps_os': {},
}
Expand Down
5 changes: 2 additions & 3 deletions src/libANGLE/renderer/vulkan/CommandProcessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void CommandProcessor::queueCommands(const vk::CommandProcessorTask &commands)
mWorkAvailableCondition.notify_one();
}

angle::Result CommandProcessor::processCommandProcessorTasks()
void CommandProcessor::processCommandProcessorTasks()
{
while (true)
{
Expand All @@ -48,11 +48,10 @@ angle::Result CommandProcessor::processCommandProcessorTasks()

ASSERT(!task.commandBuffer->empty());
// TODO: Will need some way to synchronize error reporting between threads
ANGLE_TRY(task.commandBuffer->flushToPrimary(task.contextVk, task.primaryCB));
(void)(task.commandBuffer->flushToPrimary(task.contextVk, task.primaryCB));
ASSERT(task.commandBuffer->empty());
task.commandBuffer->releaseToContextQueue(task.contextVk);
}
return angle::Result::Continue;
}

void CommandProcessor::waitForWorkComplete()
Expand Down
2 changes: 1 addition & 1 deletion src/libANGLE/renderer/vulkan/CommandProcessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class CommandProcessor : angle::NonCopyable

// Main worker loop that should be launched in its own thread. The
// loop waits for work to be submitted from a separate thread.
angle::Result processCommandProcessorTasks();
void processCommandProcessorTasks();
// Called asynchronously from workLoop() thread to queue work that is
// then processed by the workLoop() thread
void queueCommands(const vk::CommandProcessorTask &commands);
Expand Down

0 comments on commit 2321158

Please sign in to comment.