diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-14 11:21:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 11:21:46 -0700 |
| commit | 768f585255d1754fce9009daa7c68eab4e1fc7d1 (patch) | |
| tree | fbb5f30b832490d2b7bb1af4c3cc9aaf2472288b /Source/WebCore/platform | |
| parent | d6fdf6ea9fb84f2b986531ebcbd31dc19f7d3cfb (diff) | |
| parent | 2984cd062c3533700d08979a1ba76b3b04fcb395 (diff) | |
| download | external_webkit-768f585255d1754fce9009daa7c68eab4e1fc7d1.zip external_webkit-768f585255d1754fce9009daa7c68eab4e1fc7d1.tar.gz external_webkit-768f585255d1754fce9009daa7c68eab4e1fc7d1.tar.bz2 | |
Merge "Add more debug log for GL error" into jb-dev
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp b/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp index 19dc1f8..bfa0789 100644 --- a/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp @@ -533,9 +533,11 @@ void GLUtils::createTextureWithBitmap(GLuint texture, const SkBitmap& bitmap, GL #ifndef DEBUG if (allowGLLog()) #endif - ALOGE("GL ERROR: glTexImage2D parameters are : bitmap.width() %d, bitmap.height() %d," + ALOGE("GL ERROR: glTexImage2D parameters are : textureId %d," + " bitmap.width() %d, bitmap.height() %d," " internalformat 0x%x, type 0x%x, bitmap.getPixels() %p", - bitmap.width(), bitmap.height(), internalformat, type, bitmap.getPixels()); + texture, bitmap.width(), bitmap.height(), internalformat, type, + bitmap.getPixels()); } glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter); @@ -563,9 +565,11 @@ void GLUtils::updateTextureWithBitmap(GLuint texture, const SkBitmap& bitmap, #ifndef DEBUG if (allowGLLog()) #endif - ALOGE("GL ERROR: glTexSubImage2D parameters are : bitmap.width() %d, bitmap.height() %d," + ALOGE("GL ERROR: glTexSubImage2D parameters are : textureId %d," + " bitmap.width() %d, bitmap.height() %d," " internalformat 0x%x, type 0x%x, bitmap.getPixels() %p", - bitmap.width(), bitmap.height(), internalformat, type, bitmap.getPixels()); + texture, bitmap.width(), bitmap.height(), internalformat, type, + bitmap.getPixels()); } glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter); |