OLD | NEW |
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/query_manager.h" | 5 #include "gpu/command_buffer/service/query_manager.h" |
6 #include "gpu/command_buffer/common/gles2_cmd_format.h" | 6 #include "gpu/command_buffer/common/gles2_cmd_format.h" |
7 #include "gpu/command_buffer/service/cmd_buffer_engine.h" | 7 #include "gpu/command_buffer/service/cmd_buffer_engine.h" |
8 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 8 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
9 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" | 9 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" |
10 #include "gpu/command_buffer/service/feature_info.h" | 10 #include "gpu/command_buffer/service/feature_info.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 return false; | 121 return false; |
122 } | 122 } |
123 | 123 |
124 // Overridden from CommandBufferEngine. | 124 // Overridden from CommandBufferEngine. |
125 virtual int32 GetGetOffset() OVERRIDE { | 125 virtual int32 GetGetOffset() OVERRIDE { |
126 DCHECK(false); | 126 DCHECK(false); |
127 return 0; | 127 return 0; |
128 } | 128 } |
129 | 129 |
130 private: | 130 private: |
131 scoped_array<int8> data_; | 131 scoped_ptr<int8[]> data_; |
132 gpu::Buffer valid_buffer_; | 132 gpu::Buffer valid_buffer_; |
133 gpu::Buffer invalid_buffer_; | 133 gpu::Buffer invalid_buffer_; |
134 }; | 134 }; |
135 | 135 |
136 scoped_ptr<MockCommandBufferEngine> engine_; | 136 scoped_ptr<MockCommandBufferEngine> engine_; |
137 }; | 137 }; |
138 | 138 |
139 // GCC requires these declarations, but MSVC requires they not be present | 139 // GCC requires these declarations, but MSVC requires they not be present |
140 #ifndef COMPILER_MSVC | 140 #ifndef COMPILER_MSVC |
141 const int32 QueryManagerTest::kSharedMemoryId; | 141 const int32 QueryManagerTest::kSharedMemoryId; |
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 | 561 |
562 EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result); | 562 EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result); |
563 | 563 |
564 manager->Destroy(false); | 564 manager->Destroy(false); |
565 } | 565 } |
566 | 566 |
567 } // namespace gles2 | 567 } // namespace gles2 |
568 } // namespace gpu | 568 } // namespace gpu |
569 | 569 |
570 | 570 |
OLD | NEW |