Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Unified Diff: gpu/command_buffer/service/in_process_command_buffer.cc

Issue 816543004: Update from https://crrev.com/308996 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.h ('k') | gpu/command_buffer/service/test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/in_process_command_buffer.cc
diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc
index 8836904ce9d6360344238f72a63b8d3cd23b5a4a..529ffc49b527ead87ae8106320ae8421d0b6c508 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.cc
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc
@@ -32,6 +32,7 @@
#include "gpu/command_buffer/service/memory_tracking.h"
#include "gpu/command_buffer/service/query_manager.h"
#include "gpu/command_buffer/service/transfer_buffer_manager.h"
+#include "gpu/command_buffer/service/valuebuffer_manager.h"
#include "ui/gfx/size.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_image.h"
@@ -198,10 +199,18 @@ InProcessCommandBuffer::Service::mailbox_manager() {
return mailbox_manager_;
}
-scoped_refptr<gpu::ValueStateMap>
+scoped_refptr<gles2::SubscriptionRefSet>
+InProcessCommandBuffer::Service::subscription_ref_set() {
+ if (!subscription_ref_set_.get()) {
+ subscription_ref_set_ = new gles2::SubscriptionRefSet();
+ }
+ return subscription_ref_set_;
+}
+
+scoped_refptr<ValueStateMap>
InProcessCommandBuffer::Service::pending_valuebuffer_state() {
if (!pending_valuebuffer_state_.get()) {
- pending_valuebuffer_state_ = new gpu::ValueStateMap();
+ pending_valuebuffer_state_ = new ValueStateMap();
}
return pending_valuebuffer_state_;
}
@@ -351,6 +360,7 @@ bool InProcessCommandBuffer::InitializeOnGpuThread(
NULL,
service_->shader_translator_cache(),
NULL,
+ service_->subscription_ref_set(),
service_->pending_valuebuffer_state(),
bind_generates_resource)));
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.h ('k') | gpu/command_buffer/service/test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698