Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc

Issue 21159007: cc: Adding support for RGBA_4444 tile textures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed a signed vs. unsigned comparison in video_resource_updater.cc Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/async_pixel_transfer_manager_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 64e1f32c76bcdfdb7c97c4fb245552dfe9c74967..dc57f5e770e00a21f40fac0f88187591d2394312 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc
@@ -170,7 +170,8 @@ class TransferStateInternal
"width", define_params_.width,
"height", define_params_.height);
DCHECK(texture_id_);
- DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_);
+ if (EGL_NO_IMAGE_KHR == egl_image_)
+ return;
glBindTexture(GL_TEXTURE_2D, texture_id_);
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, egl_image_);
@@ -203,7 +204,8 @@ class TransferStateInternal
egl_buffer,
egl_attrib_list);
- DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_);
+ DLOG_IF(ERROR, EGL_NO_IMAGE_KHR == egl_image_)
+ << "eglCreateImageKHR failed";
}
void CreateEglImageOnUploadThread() {
@@ -259,7 +261,10 @@ class TransferStateInternal
tex_params.height);
DCHECK(!thread_texture_id_);
DCHECK_EQ(0, tex_params.level);
- DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
+ if (EGL_NO_IMAGE_KHR == egl_image_) {
+ MarkAsCompleted();
+ return;
+ }
void* data =
AsyncPixelTransferDelegate::GetAddress(safe_shared_memory, mem_params);
« no previous file with comments | « gpu/command_buffer/service/async_pixel_transfer_manager_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698