Index: gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc |
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc |
index 34e3a3702bf18d4f1839099ad2c3188a8537183d..0ec66aa53285048b52ebe7c0cf828f3c11fa39d1 100644 |
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc |
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc |
@@ -409,6 +409,13 @@ class AsyncPixelTransferDelegateEGL |
const base::Closure& bind_callback) override; |
void AsyncTexSubImage2D(const AsyncTexSubImage2DParams& tex_params, |
const AsyncMemoryParams& mem_params) override; |
+ void AsyncCompressedTexImage2D( |
+ const AsyncCompressedTexImage2DParams& tex_params, |
+ const AsyncMemoryParams& mem_params, |
+ const base::Closure& bind_callback) override; |
+ void AsyncCompressedTexSubImage2D( |
+ const AsyncCompressedTexSubImage2DParams& tex_params, |
+ const AsyncMemoryParams& mem_params) override; |
bool TransferIsInProgress() override; |
void WaitForTransferCompletion() override; |
@@ -545,6 +552,21 @@ void AsyncPixelTransferDelegateEGL::AsyncTexSubImage2D( |
DCHECK(CHECK_GL()); |
} |
+void AsyncPixelTransferDelegateEGL::AsyncCompressedTexImage2D( |
+ const AsyncCompressedTexImage2DParams& tex_params, |
+ const AsyncMemoryParams& mem_params, |
+ const base::Closure& bind_callback) { |
+ // EGLImage does not support compressed formats. |
+ NOTREACHED(); |
+} |
+ |
+void AsyncPixelTransferDelegateEGL::AsyncCompressedTexSubImage2D( |
+ const AsyncCompressedTexSubImage2DParams& tex_params, |
+ const AsyncMemoryParams& mem_params) { |
+ // EGLImage does not support compressed formats. |
+ NOTREACHED(); |
+} |
+ |
namespace { |
bool IsPowerOfTwo (unsigned int x) { |
return ((x != 0) && !(x & (x - 1))); |
@@ -737,6 +759,23 @@ void AsyncPixelTransferManagerEGL::WaitAllAsyncTexImage2D() { |
delegate->WaitForTransferCompletion(); |
} |
+void AsyncPixelTransferManagerEGL::SuspendUploads( |
+ base::WaitableEvent* waitable) { |
+ transfer_message_loop_proxy()->PostTask( |
+ FROM_HERE, |
+ base::Bind(&base::WaitableEvent::Wait, |
+ base::Owned(waitable))); |
+} |
+ |
+void AsyncPixelTransferManagerEGL::SignalWhenUploadsCompleted( |
+ base::WaitableEvent* waitable) { |
+ transfer_message_loop_proxy()->PostTask( |
+ FROM_HERE, |
+ base::Bind(&base::WaitableEvent::Signal, |
+ // Waitable owned by waiter. |
+ base::Unretained(waitable))); |
+} |
+ |
AsyncPixelTransferDelegate* |
AsyncPixelTransferManagerEGL::CreatePixelTransferDelegateImpl( |
gles2::TextureRef* ref, |
@@ -745,4 +784,13 @@ AsyncPixelTransferManagerEGL::CreatePixelTransferDelegateImpl( |
&shared_state_, ref->service_id(), define_params); |
} |
+AsyncPixelTransferDelegate* |
+AsyncPixelTransferManagerEGL::CreatePixelTransferDelegateImpl( |
+ gles2::TextureRef* ref, |
+ const AsyncCompressedTexImage2DParams& define_params) { |
+ // EGLImage does not support non-standard formats such as compressed ones. |
+ NOTREACHED(); |
+ return NULL; |
+} |
+ |
} // namespace gpu |