| 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/error_state_mock.h" | 8 #include "gpu/command_buffer/service/error_state_mock.h" |
| 9 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 9 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
| 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" | 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 DCHECK(false); | 121 DCHECK(false); |
| 122 return false; | 122 return false; |
| 123 } | 123 } |
| 124 | 124 |
| 125 // Overridden from CommandBufferEngine. | 125 // Overridden from CommandBufferEngine. |
| 126 virtual int32 GetGetOffset() OVERRIDE { | 126 virtual int32 GetGetOffset() OVERRIDE { |
| 127 DCHECK(false); | 127 DCHECK(false); |
| 128 return 0; | 128 return 0; |
| 129 } | 129 } |
| 130 | 130 |
| 131 // Overridden from CommandBufferEngine. |
| 132 virtual gfx::GLImage* GetImage(int32 image_id) OVERRIDE { |
| 133 DCHECK(false); |
| 134 return NULL; |
| 135 } |
| 136 |
| 131 private: | 137 private: |
| 132 scoped_ptr<int8[]> data_; | 138 scoped_ptr<int8[]> data_; |
| 133 gpu::Buffer valid_buffer_; | 139 gpu::Buffer valid_buffer_; |
| 134 gpu::Buffer invalid_buffer_; | 140 gpu::Buffer invalid_buffer_; |
| 135 }; | 141 }; |
| 136 | 142 |
| 137 scoped_ptr<MockCommandBufferEngine> engine_; | 143 scoped_ptr<MockCommandBufferEngine> engine_; |
| 138 }; | 144 }; |
| 139 | 145 |
| 140 // GCC requires these declarations, but MSVC requires they not be present | 146 // GCC requires these declarations, but MSVC requires they not be present |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 565 | 571 |
| 566 EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result); | 572 EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), sync->result); |
| 567 | 573 |
| 568 manager->Destroy(false); | 574 manager->Destroy(false); |
| 569 } | 575 } |
| 570 | 576 |
| 571 } // namespace gles2 | 577 } // namespace gles2 |
| 572 } // namespace gpu | 578 } // namespace gpu |
| 573 | 579 |
| 574 | 580 |
| OLD | NEW |