diff options
| author | sievers <sievers@chromium.org> | 2014-10-24 12:11:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 19:12:15 +0000 |
| commit | b727d53654c5b686bd0cc3cd678ea0d78e0b95c8 (patch) | |
| tree | 1e7627b79a2a0b0bd54527395050ea6a12fb18b5 /mojo/services/native_viewport | |
| parent | 2e434b4c460fb4274dbfc9ccd7561e7339d00926 (diff) | |
| download | chromium_src-b727d53654c5b686bd0cc3cd678ea0d78e0b95c8.zip chromium_src-b727d53654c5b686bd0cc3cd678ea0d78e0b95c8.tar.gz chromium_src-b727d53654c5b686bd0cc3cd678ea0d78e0b95c8.tar.bz2 | |
gpu: Rewrite MailboxSynchronizer
The current version that tries to synchronize the tracked textures between
separate MailboxManager instances does not get things right, see added tests.
Simplify the problem by subclassing MailboxManager.
NOTRY=True
Review URL: https://codereview.chromium.org/670953004
Cr-Commit-Position: refs/heads/master@{#301165}
Diffstat (limited to 'mojo/services/native_viewport')
| -rw-r--r-- | mojo/services/native_viewport/DEPS | 1 | ||||
| -rw-r--r-- | mojo/services/native_viewport/main.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mojo/services/native_viewport/DEPS b/mojo/services/native_viewport/DEPS index 60e2518..4a4ec52 100644 --- a/mojo/services/native_viewport/DEPS +++ b/mojo/services/native_viewport/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+cc/surfaces", "+gpu/command_buffer/service/mailbox_manager.h", + "+gpu/command_buffer/service/mailbox_manager_impl.h", "+mojo/application", "+mojo/converters/geometry", "+mojo/converters/input_events", diff --git a/mojo/services/native_viewport/main.cc b/mojo/services/native_viewport/main.cc index 1cd936f..a0de653 100644 --- a/mojo/services/native_viewport/main.cc +++ b/mojo/services/native_viewport/main.cc @@ -4,7 +4,7 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "gpu/command_buffer/service/mailbox_manager.h" +#include "gpu/command_buffer/service/mailbox_manager_impl.h" #include "mojo/application/application_runner_chromium.h" #include "mojo/public/c/system/main.h" #include "mojo/public/cpp/application/application_connection.h" @@ -26,7 +26,7 @@ class NativeViewportAppDelegate public: NativeViewportAppDelegate() : share_group_(new gfx::GLShareGroup), - mailbox_manager_(new gpu::gles2::MailboxManager), + mailbox_manager_(new gpu::gles2::MailboxManagerImpl), is_headless_(false) {} ~NativeViewportAppDelegate() override {} |