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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 217813004: Make ShaderTranslatorCache thread safe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: protect ShFinalize Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 EGL_ALPHA_SIZE, request_alpha ? 8 : 0, 296 EGL_ALPHA_SIZE, request_alpha ? 8 : 0,
297 EGL_DEPTH_SIZE, request_depth ? 24 : 0, 297 EGL_DEPTH_SIZE, request_depth ? 24 : 0,
298 EGL_STENCIL_SIZE, request_stencil ? 8 : 0, 298 EGL_STENCIL_SIZE, request_stencil ? 8 : 0,
299 }; 299 };
300 std::vector<int32> attribs(attributes, attributes + arraysize(attributes)); 300 std::vector<int32> attribs(attributes, attributes + arraysize(attributes));
301 301
302 decoder_.reset(GLES2Decoder::Create(group_.get())); 302 decoder_.reset(GLES2Decoder::Create(group_.get()));
303 decoder_->GetLogger()->set_log_synthesized_gl_errors(false); 303 decoder_->GetLogger()->set_log_synthesized_gl_errors(false);
304 decoder_->Initialize(surface_, 304 decoder_->Initialize(surface_,
305 context_, 305 context_,
306 new ShaderTranslatorCache,
306 false, 307 false,
307 surface_->GetSize(), 308 surface_->GetSize(),
308 DisallowedFeatures(), 309 DisallowedFeatures(),
309 attribs); 310 attribs);
310 decoder_->MakeCurrent(); 311 decoder_->MakeCurrent();
311 decoder_->set_engine(engine_.get()); 312 decoder_->set_engine(engine_.get());
312 decoder_->BeginDecoding(); 313 decoder_->BeginDecoding();
313 314
314 EXPECT_CALL(*gl_, GenBuffersARB(_, _)) 315 EXPECT_CALL(*gl_, GenBuffersARB(_, _))
315 .WillOnce(SetArgumentPointee<1>(kServiceBufferId)) 316 .WillOnce(SetArgumentPointee<1>(kServiceBufferId))
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 SetupDefaultProgram(); 1465 SetupDefaultProgram();
1465 } 1466 }
1466 1467
1467 // Include the auto-generated part of this file. We split this because it means 1468 // Include the auto-generated part of this file. We split this because it means
1468 // we can easily edit the non-auto generated parts right here in this file 1469 // we can easily edit the non-auto generated parts right here in this file
1469 // instead of having to edit some template or the code generator. 1470 // instead of having to edit some template or the code generator.
1470 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 1471 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
1471 1472
1472 } // namespace gles2 1473 } // namespace gles2
1473 } // namespace gpu 1474 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698