Chromium Code Reviews| 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/tests/gl_manager.h" | 5 #include "gpu/command_buffer/tests/gl_manager.h" |
| 6 | 6 |
| 7 #include <GLES2/gl2.h> | 7 #include <GLES2/gl2.h> |
| 8 #include <GLES2/gl2ext.h> | 8 #include <GLES2/gl2ext.h> |
| 9 #include <GLES2/gl2extchromium.h> | 9 #include <GLES2/gl2extchromium.h> |
| 10 | 10 |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/at_exit.h" | 13 #include "base/at_exit.h" |
| 14 #include "base/bind.h" | 14 #include "base/bind.h" |
| 15 #include "base/memory/ref_counted_memory.h" | 15 #include "base/memory/ref_counted_memory.h" |
| 16 #include "gpu/command_buffer/client/gles2_implementation.h" | 16 #include "gpu/command_buffer/client/gles2_implementation.h" |
| 17 #include "gpu/command_buffer/client/gles2_lib.h" | 17 #include "gpu/command_buffer/client/gles2_lib.h" |
| 18 #include "gpu/command_buffer/client/transfer_buffer.h" | 18 #include "gpu/command_buffer/client/transfer_buffer.h" |
| 19 #include "gpu/command_buffer/common/constants.h" | 19 #include "gpu/command_buffer/common/constants.h" |
| 20 #include "gpu/command_buffer/common/gles2_cmd_utils.h" | 20 #include "gpu/command_buffer/common/gles2_cmd_utils.h" |
| 21 #include "gpu/command_buffer/common/value_state.h" | 21 #include "gpu/command_buffer/common/value_state.h" |
| 22 #include "gpu/command_buffer/service/command_buffer_service.h" | 22 #include "gpu/command_buffer/service/command_buffer_service.h" |
| 23 #include "gpu/command_buffer/service/context_group.h" | 23 #include "gpu/command_buffer/service/context_group.h" |
| 24 #include "gpu/command_buffer/service/gl_context_virtual.h" | 24 #include "gpu/command_buffer/service/gl_context_virtual.h" |
| 25 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 25 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
| 26 #include "gpu/command_buffer/service/gpu_scheduler.h" | 26 #include "gpu/command_buffer/service/gpu_scheduler.h" |
| 27 #include "gpu/command_buffer/service/image_manager.h" | 27 #include "gpu/command_buffer/service/image_manager.h" |
| 28 #include "gpu/command_buffer/service/mailbox_manager_impl.h" | 28 #include "gpu/command_buffer/service/mailbox_manager_impl.h" |
| 29 #include "gpu/command_buffer/service/memory_tracking.h" | 29 #include "gpu/command_buffer/service/memory_tracking.h" |
| 30 #include "gpu/command_buffer/service/valuebuffer_manager.h" | |
|
bajones
2014/12/04 23:23:14
Is this include necessary?
orglofch
2014/12/04 23:37:10
Same here.
| |
| 30 #include "testing/gtest/include/gtest/gtest.h" | 31 #include "testing/gtest/include/gtest/gtest.h" |
| 31 #include "ui/gfx/gpu_memory_buffer.h" | 32 #include "ui/gfx/gpu_memory_buffer.h" |
| 32 #include "ui/gl/gl_context.h" | 33 #include "ui/gl/gl_context.h" |
| 33 #include "ui/gl/gl_image_ref_counted_memory.h" | 34 #include "ui/gl/gl_image_ref_counted_memory.h" |
| 34 #include "ui/gl/gl_share_group.h" | 35 #include "ui/gl/gl_share_group.h" |
| 35 #include "ui/gl/gl_surface.h" | 36 #include "ui/gl/gl_surface.h" |
| 36 | 37 |
| 37 namespace gpu { | 38 namespace gpu { |
| 38 namespace { | 39 namespace { |
| 39 | 40 |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 198 if (!context_group) { | 199 if (!context_group) { |
| 199 scoped_refptr<gles2::FeatureInfo> feature_info; | 200 scoped_refptr<gles2::FeatureInfo> feature_info; |
| 200 if (command_line) | 201 if (command_line) |
| 201 feature_info = new gles2::FeatureInfo(*command_line); | 202 feature_info = new gles2::FeatureInfo(*command_line); |
| 202 context_group = | 203 context_group = |
| 203 new gles2::ContextGroup(mailbox_manager_.get(), | 204 new gles2::ContextGroup(mailbox_manager_.get(), |
| 204 NULL, | 205 NULL, |
| 205 new gpu::gles2::ShaderTranslatorCache, | 206 new gpu::gles2::ShaderTranslatorCache, |
| 206 feature_info, | 207 feature_info, |
| 207 NULL, | 208 NULL, |
| 209 NULL, | |
| 208 options.bind_generates_resource); | 210 options.bind_generates_resource); |
| 209 } | 211 } |
| 210 | 212 |
| 211 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); | 213 decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group)); |
| 212 | 214 |
| 213 command_buffer_.reset(new CommandBufferService( | 215 command_buffer_.reset(new CommandBufferService( |
| 214 decoder_->GetContextGroup()->transfer_buffer_manager())); | 216 decoder_->GetContextGroup()->transfer_buffer_manager())); |
| 215 ASSERT_TRUE(command_buffer_->Initialize()) | 217 ASSERT_TRUE(command_buffer_->Initialize()) |
| 216 << "could not create command buffer service"; | 218 << "could not create command buffer service"; |
| 217 | 219 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 420 void GLManager::SetSurfaceVisible(bool visible) { | 422 void GLManager::SetSurfaceVisible(bool visible) { |
| 421 NOTIMPLEMENTED(); | 423 NOTIMPLEMENTED(); |
| 422 } | 424 } |
| 423 | 425 |
| 424 uint32 GLManager::CreateStreamTexture(uint32 texture_id) { | 426 uint32 GLManager::CreateStreamTexture(uint32 texture_id) { |
| 425 NOTIMPLEMENTED(); | 427 NOTIMPLEMENTED(); |
| 426 return 0; | 428 return 0; |
| 427 } | 429 } |
| 428 | 430 |
| 429 } // namespace gpu | 431 } // namespace gpu |
| OLD | NEW |