diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp')
-rw-r--r-- | WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp index 53d9b86..daf3b12 100644 --- a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp +++ b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp @@ -1161,11 +1161,11 @@ String GraphicsContext3D::getProgramInfoLog(Platform3DObject program) makeContextCurrent(); GLint length; ::glGetProgramiv((GLuint) program, GL_INFO_LOG_LENGTH, &length); - + if (!length) + return ""; + GLsizei size; GLchar* info = (GLchar*) fastMalloc(length); - if (!info) - return ""; ::glGetProgramInfoLog((GLuint) program, length, &size, info); String s(info); @@ -1227,8 +1227,6 @@ String GraphicsContext3D::getShaderInfoLog(Platform3DObject shader) ASSERT(shader); makeContextCurrent(); - GLint length; - ::glGetShaderiv((GLuint) shader, GL_INFO_LOG_LENGTH, &length); HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader); @@ -1240,21 +1238,19 @@ String GraphicsContext3D::getShaderInfoLog(Platform3DObject shader) if (entry.isValid) { GLint length; ::glGetShaderiv((GLuint) shader, GL_INFO_LOG_LENGTH, &length); + if (!length) + return ""; GLsizei size; GLchar* info = (GLchar*) fastMalloc(length); - if (!info) - return ""; ::glGetShaderInfoLog((GLuint) shader, length, &size, info); String s(info); fastFree(info); return s; - } - else { + } else return entry.log; - } } String GraphicsContext3D::getShaderSource(Platform3DObject shader) @@ -1449,6 +1445,11 @@ void GraphicsContext3D::synthesizeGLError(unsigned long error) m_syntheticErrors.add(error); } +int GraphicsContext3D::getGraphicsResetStatusARB() +{ + return NO_ERROR; +} + } #endif // ENABLE(3D_CANVAS) |