| Index: gpu/ipc/client/command_buffer_proxy_impl.cc
|
| diff --git a/gpu/ipc/client/command_buffer_proxy_impl.cc b/gpu/ipc/client/command_buffer_proxy_impl.cc
|
| index 9c1ec56129bfe93855e8fcf7c8e57bed88371689..faf69b980ed8cbc2567353d7faaf7d3c9290e6ed 100644
|
| --- a/gpu/ipc/client/command_buffer_proxy_impl.cc
|
| +++ b/gpu/ipc/client/command_buffer_proxy_impl.cc
|
| @@ -455,9 +455,6 @@ int32_t CommandBufferProxyImpl::CreateImage(ClientBuffer buffer,
|
| gpu_memory_buffer_manager->GpuMemoryBufferFromClientBuffer(buffer);
|
| DCHECK(gpu_memory_buffer);
|
|
|
| - DCHECK(image_gmb_map_.find(new_id) == image_gmb_map_.end());
|
| - image_gmb_map_[new_id].gpu_memory_buffer_id = gpu_memory_buffer->GetId().id;
|
| -
|
| // This handle is owned by the GPU process and must be passed to it or it
|
| // will leak. In otherwords, do not early out on error between here and the
|
| // sending of the CreateImage IPC below.
|
| @@ -511,9 +508,6 @@ void CommandBufferProxyImpl::DestroyImage(int32_t id) {
|
| if (last_state_.error != gpu::error::kNoError)
|
| return;
|
|
|
| - auto it = image_gmb_map_.find(id);
|
| - if (it != image_gmb_map_.end())
|
| - image_gmb_map_.erase(it);
|
| Send(new GpuCommandBufferMsg_DestroyImage(route_id_, id));
|
| }
|
|
|
| @@ -533,19 +527,9 @@ int32_t CommandBufferProxyImpl::CreateGpuMemoryBufferImage(
|
|
|
| int32_t result =
|
| CreateImage(buffer->AsClientBuffer(), width, height, internal_format);
|
| - if (result != -1)
|
| - image_gmb_map_[result].owned_gpu_memory_buffer = std::move(buffer);
|
| return result;
|
| }
|
|
|
| -int32_t CommandBufferProxyImpl::GetImageGpuMemoryBufferId(unsigned image_id) {
|
| - CheckLock();
|
| - auto it = image_gmb_map_.find(image_id);
|
| - if (it != image_gmb_map_.end())
|
| - return it->second.gpu_memory_buffer_id;
|
| - return -1;
|
| -}
|
| -
|
| uint32_t CommandBufferProxyImpl::CreateStreamTexture(uint32_t texture_id) {
|
| CheckLock();
|
| if (last_state_.error != gpu::error::kNoError)
|
| @@ -873,10 +857,4 @@ void CommandBufferProxyImpl::DisconnectChannel() {
|
| gpu_control_client_->OnGpuControlLostContext();
|
| }
|
|
|
| -CommandBufferProxyImpl::ImageInfo::ImageInfo() {}
|
| -CommandBufferProxyImpl::ImageInfo::~ImageInfo() {}
|
| -CommandBufferProxyImpl::ImageInfo::ImageInfo(ImageInfo&& other) = default;
|
| -CommandBufferProxyImpl::ImageInfo& CommandBufferProxyImpl::ImageInfo::operator=(
|
| - ImageInfo&& other) = default;
|
| -
|
| } // namespace gpu
|
|
|