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

Side by Side Diff: gpu/command_buffer/tests/gl_tests_main.cc

Issue 10181009: Fix gl_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "gpu/command_buffer/client/gles2_lib.h"
8 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/gfx/gl/gl_surface.h" 11 #include "ui/gfx/gl/gl_surface.h"
11 12
12 #if defined(TOOLKIT_GTK) 13 #if defined(TOOLKIT_GTK)
13 #include "ui/gfx/gtk_util.h" 14 #include "ui/gfx/gtk_util.h"
14 #endif 15 #endif
15 16
16 int main(int argc, char** argv) { 17 int main(int argc, char** argv) {
17 base::AtExitManager exit_manager; 18 base::AtExitManager exit_manager;
18 CommandLine::Init(argc, argv); 19 CommandLine::Init(argc, argv);
19 #if defined(TOOLKIT_GTK) 20 #if defined(TOOLKIT_GTK)
20 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); 21 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
21 #endif 22 #endif
22 gfx::GLSurface::InitializeOneOff(); 23 gfx::GLSurface::InitializeOneOff();
24 ::gles2::Initialize();
23 MessageLoop::Type message_loop_type = MessageLoop::TYPE_UI; 25 MessageLoop::Type message_loop_type = MessageLoop::TYPE_UI;
24 MessageLoop main_message_loop(message_loop_type); 26 MessageLoop main_message_loop(message_loop_type);
25 testing::InitGoogleMock(&argc, argv); 27 testing::InitGoogleMock(&argc, argv);
26 return RUN_ALL_TESTS(); 28 return RUN_ALL_TESTS();
27 } 29 }
28 30
29 31
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698