| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/in_process_command_buffer.h" | 5 #include "gpu/command_buffer/service/in_process_command_buffer.h" |
| 6 | 6 |
| 7 #include <queue> | 7 #include <queue> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 897 base::Bind(&InProcessCommandBuffer::CreateStreamTextureOnGpuThread, | 897 base::Bind(&InProcessCommandBuffer::CreateStreamTextureOnGpuThread, |
| 898 base::Unretained(this), | 898 base::Unretained(this), |
| 899 texture_id); | 899 texture_id); |
| 900 QueueTask( | 900 QueueTask( |
| 901 base::Bind(&RunTaskWithResult<uint32>, task, &stream_id, &completion)); | 901 base::Bind(&RunTaskWithResult<uint32>, task, &stream_id, &completion)); |
| 902 completion.Wait(); | 902 completion.Wait(); |
| 903 return stream_id; | 903 return stream_id; |
| 904 } | 904 } |
| 905 | 905 |
| 906 void InProcessCommandBuffer::SetLock(base::Lock*) { | 906 void InProcessCommandBuffer::SetLock(base::Lock*) { |
| 907 NOTIMPLEMENTED(); | |
| 908 } | 907 } |
| 909 | 908 |
| 910 uint32 InProcessCommandBuffer::CreateStreamTextureOnGpuThread( | 909 uint32 InProcessCommandBuffer::CreateStreamTextureOnGpuThread( |
| 911 uint32 client_texture_id) { | 910 uint32 client_texture_id) { |
| 912 #if defined(OS_ANDROID) | 911 #if defined(OS_ANDROID) |
| 913 return stream_texture_manager_->CreateStreamTexture( | 912 return stream_texture_manager_->CreateStreamTexture( |
| 914 client_texture_id, decoder_->GetContextGroup()->texture_manager()); | 913 client_texture_id, decoder_->GetContextGroup()->texture_manager()); |
| 915 #else | 914 #else |
| 916 return 0; | 915 return 0; |
| 917 #endif | 916 #endif |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 962 | 961 |
| 963 #if defined(OS_ANDROID) | 962 #if defined(OS_ANDROID) |
| 964 scoped_refptr<gfx::SurfaceTexture> | 963 scoped_refptr<gfx::SurfaceTexture> |
| 965 InProcessCommandBuffer::GetSurfaceTexture(uint32 stream_id) { | 964 InProcessCommandBuffer::GetSurfaceTexture(uint32 stream_id) { |
| 966 DCHECK(stream_texture_manager_); | 965 DCHECK(stream_texture_manager_); |
| 967 return stream_texture_manager_->GetSurfaceTexture(stream_id); | 966 return stream_texture_manager_->GetSurfaceTexture(stream_id); |
| 968 } | 967 } |
| 969 #endif | 968 #endif |
| 970 | 969 |
| 971 } // namespace gpu | 970 } // namespace gpu |
| OLD | NEW |