| Index: content/common/gpu/media/gpu_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| index 21247b210207b02721048c743dcf0e9f55e48751..ddfe8847ff4722d845849f84ef45e21f7514f1fb 100644
|
| --- a/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| @@ -122,10 +122,13 @@ class GpuVideoDecodeAccelerator
|
| void SetTextureCleared(const media::Picture& picture);
|
|
|
| #if (defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)) || defined(OS_MACOSX)
|
| - // Helper to bind |image| to the texture specified by |client_texture_id|.
|
| + // Helper to bind |image| to the texture specified by |client_texture_id|. If
|
| + // |can_bind_to_sampler| is true, then the image may be used as a sampler
|
| + // directly, otherwise a copy to a staging buffer is required.
|
| void BindImage(uint32_t client_texture_id,
|
| uint32_t texture_target,
|
| - scoped_refptr<gl::GLImage> image);
|
| + scoped_refptr<gl::GLImage> image,
|
| + bool can_bind_to_sampler);
|
| #endif
|
|
|
| // Route ID to communicate with the host.
|
|
|