summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-05-14 10:54:40 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-05-14 10:58:48 -0700
commit2984cd062c3533700d08979a1ba76b3b04fcb395 (patch)
tree638679a6d4dc282a4659de1ad046b23f8f9eff05 /Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp
parent29e99f5f6697f79eb9f402175456f40c73f4fc9c (diff)
downloadexternal_webkit-2984cd062c3533700d08979a1ba76b3b04fcb395.zip
external_webkit-2984cd062c3533700d08979a1ba76b3b04fcb395.tar.gz
external_webkit-2984cd062c3533700d08979a1ba76b3b04fcb395.tar.bz2
Add more debug log for GL error
bug:6486310 Change-Id: I7a4ca54eddc445c9228f44fff4cd35835b8bf5ff
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/GLUtils.cpp12
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);