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

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

Issue 2826043002: Do not share FBOs/VAOs/Transform feedback objects across contexts (Closed)
Patch Set: added DeleteFramebuffers() expectation Created 3 years, 7 months 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
Index: gpu/command_buffer/service/context_group.cc
diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
index de793240f9b33f38a63ab05d96f2103cab443c77..b4e09199e0ff78cbd2d80f33ecaf18407c167f7c 100644
--- a/gpu/command_buffer/service/context_group.cc
+++ b/gpu/command_buffer/service/context_group.cc
@@ -219,9 +219,6 @@ bool ContextGroup::Initialize(GLES2Decoder* decoder,
buffer_manager_.reset(
new BufferManager(memory_tracker_.get(), feature_info_.get()));
- framebuffer_manager_.reset(
- new FramebufferManager(max_draw_buffers_, max_color_attachments_,
- framebuffer_completeness_cache_));
renderbuffer_manager_.reset(new RenderbufferManager(
memory_tracker_.get(), max_renderbuffer_size, max_samples,
feature_info_.get()));
@@ -317,7 +314,6 @@ bool ContextGroup::Initialize(GLES2Decoder* decoder,
max_cube_map_texture_size, max_rectangle_texture_size,
max_3d_texture_size, max_array_texture_layers, bind_generates_resource_,
progress_reporter_));
- texture_manager_->set_framebuffer_manager(framebuffer_manager_.get());
const GLint kMinTextureImageUnits = 8;
const GLint kMinVertexTextureImageUnits = 0;
@@ -510,14 +506,6 @@ void ContextGroup::Destroy(GLES2Decoder* decoder, bool have_context) {
ReportProgress();
}
- if (framebuffer_manager_ != NULL) {
- framebuffer_manager_->Destroy(have_context);
- if (texture_manager_)
- texture_manager_->set_framebuffer_manager(NULL);
- framebuffer_manager_.reset();
- ReportProgress();
- }
-
if (renderbuffer_manager_ != NULL) {
renderbuffer_manager_->Destroy(have_context);
renderbuffer_manager_.reset();

Powered by Google App Engine
This is Rietveld 408576698