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

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

Issue 11416117: Hookup the GPUTrace events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixup TraceEnd test Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "base/message_loop.h"
7 #include "gpu/command_buffer/common/gles2_cmd_format.h" 8 #include "gpu/command_buffer/common/gles2_cmd_format.h"
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
10 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 11 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
11 #include "gpu/command_buffer/service/context_group.h" 12 #include "gpu/command_buffer/service/context_group.h"
12 #include "gpu/command_buffer/service/program_manager.h" 13 #include "gpu/command_buffer/service/program_manager.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/gl/gl_mock.h" 15 #include "ui/gl/gl_mock.h"
15 16
16 using ::gfx::MockGLInterface; 17 using ::gfx::MockGLInterface;
(...skipping 19 matching lines...) Expand all
36 const uint32 kBucketId = 123; 37 const uint32 kBucketId = 123;
37 const char kName[] = "test_command"; 38 const char kName[] = "test_command";
38 SetBucketAsCString(kBucketId, kName); 39 SetBucketAsCString(kBucketId, kName);
39 40
40 TraceBeginCHROMIUM begin_cmd; 41 TraceBeginCHROMIUM begin_cmd;
41 begin_cmd.Init(kBucketId); 42 begin_cmd.Init(kBucketId);
42 EXPECT_EQ(error::kNoError, ExecuteCmd(begin_cmd)); 43 EXPECT_EQ(error::kNoError, ExecuteCmd(begin_cmd));
43 } 44 }
44 45
45 TEST_F(GLES2DecoderTest3, TraceEndCHROMIUM) { 46 TEST_F(GLES2DecoderTest3, TraceEndCHROMIUM) {
47 MessageLoop loop(MessageLoop::TYPE_DEFAULT);
48
46 // Test end fails if no begin. 49 // Test end fails if no begin.
47 TraceEndCHROMIUM end_cmd; 50 TraceEndCHROMIUM end_cmd;
48 end_cmd.Init(); 51 end_cmd.Init();
49 EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd)); 52 EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd));
50 EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); 53 EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
51 54
52 const uint32 kBucketId = 123; 55 const uint32 kBucketId = 123;
53 const char kName[] = "test_command"; 56 const char kName[] = "test_command";
54 SetBucketAsCString(kBucketId, kName); 57 SetBucketAsCString(kBucketId, kName);
55 58
56 TraceBeginCHROMIUM begin_cmd; 59 TraceBeginCHROMIUM begin_cmd;
57 begin_cmd.Init(kBucketId); 60 begin_cmd.Init(kBucketId);
58 EXPECT_EQ(error::kNoError, ExecuteCmd(begin_cmd)); 61 EXPECT_EQ(error::kNoError, ExecuteCmd(begin_cmd));
59 62
60 end_cmd.Init(); 63 end_cmd.Init();
61 EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd)); 64 EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd));
62 EXPECT_EQ(GL_NO_ERROR, GetGLError()); 65 EXPECT_EQ(GL_NO_ERROR, GetGLError());
63 } 66 }
64 67
65 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h" 68 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h"
66 69
67 } // namespace gles2 70 } // namespace gles2
68 } // namespace gpu 71 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698