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

Unified Diff: gpu/command_buffer/tests/gl_manager.cc

Issue 1278333003: Fix crash caused by concurrent access to framebuffer_combo_complete_map_. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 4 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
« no previous file with comments | « gpu/command_buffer/service/texture_manager_unittest.cc ('k') | gpu/command_buffer_service.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/tests/gl_manager.cc
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index f32792fb49058fb7cb3254a861008e6dc09372fb..ea4fe25171504a31d21e02ab0a1c4090798ac884 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -275,14 +275,10 @@ void GLManager::InitializeWithCommandLine(const GLManager::Options& options,
scoped_refptr<gles2::FeatureInfo> feature_info;
if (command_line)
feature_info = new gles2::FeatureInfo(*command_line);
- context_group =
- new gles2::ContextGroup(mailbox_manager_.get(),
- NULL,
- new gpu::gles2::ShaderTranslatorCache,
- feature_info,
- NULL,
- NULL,
- options.bind_generates_resource);
+ context_group = new gles2::ContextGroup(
+ mailbox_manager_.get(), NULL, new gpu::gles2::ShaderTranslatorCache,
+ new gpu::gles2::FramebufferCompletenessCache, feature_info, NULL, NULL,
+ options.bind_generates_resource);
}
decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group));
« no previous file with comments | « gpu/command_buffer/service/texture_manager_unittest.cc ('k') | gpu/command_buffer_service.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698