Chromium Code Reviews| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc |
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
| index 02ac2f68eff5d11c63625616e781cedb442ce94b..05f32cb174bcc93a7b1cfb1d4d8748fa9e2eefba 100644 |
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
| @@ -627,6 +627,9 @@ class GLES2DecoderImpl : public GLES2Decoder, |
| virtual VertexArrayManager* GetVertexArrayManager() OVERRIDE { |
| return vertex_array_manager_.get(); |
| } |
| + virtual ImageManager* GetImageManager() OVERRIDE { |
| + return image_manager_.get(); |
| + } |
| virtual bool ProcessPendingQueries() OVERRIDE; |
| virtual bool HasMoreIdleWork() OVERRIDE; |
| virtual void PerformIdleWork() OVERRIDE; |
| @@ -780,9 +783,7 @@ class GLES2DecoderImpl : public GLES2Decoder, |
| return group_->mailbox_manager(); |
| } |
| - ImageManager* image_manager() { |
| - return group_->image_manager(); |
| - } |
| + ImageManager* image_manager() { return image_manager_.get(); } |
| VertexArrayManager* vertex_array_manager() { |
| return vertex_array_manager_.get(); |
| @@ -1711,6 +1712,8 @@ class GLES2DecoderImpl : public GLES2Decoder, |
| scoped_ptr<VertexArrayManager> vertex_array_manager_; |
| + scoped_ptr<ImageManager> image_manager_; |
| + |
| base::Callback<void(gfx::Size, float)> resize_callback_; |
| WaitSyncPointCallback wait_sync_point_callback_; |
| @@ -2383,6 +2386,8 @@ bool GLES2DecoderImpl::Initialize( |
| query_manager_.reset(new QueryManager(this, feature_info_.get())); |
| + image_manager_.reset(new ImageManager); |
| + |
| util_.set_num_compressed_texture_formats( |
| validators_->compressed_texture_format.GetValues().size()); |
| @@ -2647,10 +2652,6 @@ bool GLES2DecoderImpl::Initialize( |
| context_->SetUnbindFboOnMakeCurrent(); |
| } |
| - if (feature_info_->workarounds().release_image_after_use) { |
| - image_manager()->SetReleaseAfterUse(); |
| - } |
| - |
| // Only compositor contexts are known to use only the subset of GL |
| // that can be safely migrated between the iGPU and the dGPU. Mark |
| // those contexts as safe to forcibly transition between the GPUs. |
| @@ -2693,7 +2694,7 @@ Capabilities GLES2DecoderImpl::GetCapabilities() { |
| #endif |
| caps.post_sub_buffer = supports_post_sub_buffer_; |
| - caps.map_image = !!image_manager(); |
| + caps.map_image = true; |
|
no sievers
2014/07/01 22:49:07
should probably get rid of this capability flag
reveman
2014/07/02 14:47:54
I think we still need this for ppapi.
|
| return caps; |
| } |