diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 00:43:11 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 00:43:11 +0000 |
| commit | 465f6e817b7184ca3467f07f1ad4b0338de77add (patch) | |
| tree | baeee50c8b7299e00f875c9b59868bfff5898f1f /gpu | |
| parent | 0c9ec70c15a9ba2d2b84777e5969e543b266ca4e (diff) | |
| download | chromium_src-465f6e817b7184ca3467f07f1ad4b0338de77add.zip chromium_src-465f6e817b7184ca3467f07f1ad4b0338de77add.tar.gz chromium_src-465f6e817b7184ca3467f07f1ad4b0338de77add.tar.bz2 | |
gpu: Remove DCHECKs in AsyncPixelTransferManagerEGL about egl_image_ not being EGL_NO_IMAGE_KHR as with the upcoming 4444 texture support that assumption will no longer hold.
BUG=272539
Review URL: https://chromiumcodereview.appspot.com/23533067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc | 11 |
1 files changed, 8 insertions, 3 deletions
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 64e1f32..7e0d515 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); |