From e8b154fd68f9b33be40a3590e58347f353835f5c Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 27 Aug 2010 11:02:25 +0100 Subject: Merge WebKit at r66079 : Initial merge by git Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7 --- WebCore/html/canvas/WebGLTexture.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'WebCore/html/canvas/WebGLTexture.cpp') diff --git a/WebCore/html/canvas/WebGLTexture.cpp b/WebCore/html/canvas/WebGLTexture.cpp index e6dfd0a..7b2869f 100644 --- a/WebCore/html/canvas/WebGLTexture.cpp +++ b/WebCore/html/canvas/WebGLTexture.cpp @@ -169,11 +169,12 @@ void WebGLTexture::generateMipmapLevelInfo() m_needToUseBlackTexture = false; } -unsigned long WebGLTexture::getInternalFormat() const +unsigned long WebGLTexture::getInternalFormat(int level) const { if (!object() || !m_target) return 0; - return m_info[0][0].internalFormat; + // We assume level has been validated already. + return m_info[0][level].internalFormat; } bool WebGLTexture::isNPOT(unsigned width, unsigned height) -- cgit v1.1