| Index: gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc
|
| index 7f595d05d1d52bc6fe9e461a40f917005fd4aec7..eb451a2b66381de28f25f77cbf8908884efa7356 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc
|
| @@ -2652,10 +2652,14 @@ error::Error GLES2DecoderPassthroughImpl::DoBindUniformLocationCHROMIUM(
|
|
|
| error::Error GLES2DecoderPassthroughImpl::DoBindTexImage2DCHROMIUM(
|
| GLenum target,
|
| - GLint imageId) {
|
| + GLint imageId,
|
| + GLint fenceId) {
|
| // TODO(geofflang): error handling
|
| gl::GLImage* image = image_manager_->LookupImage(imageId);
|
| - if (!image->BindTexImage(target)) {
|
| + gl::GLFence* fence = nullptr;
|
| + if (fenceId)
|
| + fence = fence_manager_->LookupFence(fenceId);
|
| + if (!image->BindTexImage(target, fence)) {
|
| image->CopyTexImage(target);
|
| }
|
| return error::kNoError;
|
|
|