Changeset 67194 in webkit
- Timestamp:
- Sep 10, 2010 5:54:16 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r67191 r67194 1 2010-09-10 Andreas Kling <andreas.kling@nokia.com> 2 3 Reviewed by Antonio Gomes. 4 5 WebGL: Fix GCC warnings about suggested parentheses around && within || 6 https://bugs.webkit.org/show_bug.cgi?id=45534 7 8 * html/canvas/WebGLRenderingContext.cpp: 9 (WebCore::WebGLRenderingContext::getVertexAttrib): 10 (WebCore::WebGLRenderingContext::readPixels): 11 (WebCore::WebGLRenderingContext::texParameter): 12 (WebCore::WebGLRenderingContext::handleNPOTTextures): 13 1 14 2010-09-09 Alexander Pavlov <apavlov@chromium.org> 2 15 -
trunk/WebCore/html/canvas/WebGLRenderingContext.cpp
r66746 r67194 1757 1757 switch (pname) { 1758 1758 case GraphicsContext3D::VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: 1759 if ( !isGLES2Compliant() && !index && m_vertexAttribState[0].bufferBinding == m_vertexAttrib0Buffer1759 if ((!isGLES2Compliant() && !index && m_vertexAttribState[0].bufferBinding == m_vertexAttrib0Buffer) 1760 1760 || index >= m_vertexAttribState.size() 1761 1761 || !m_vertexAttribState[index].bufferBinding … … 1944 1944 } 1945 1945 // Validate array type against pixel type. 1946 if ( type == GraphicsContext3D::UNSIGNED_BYTE && !pixels->isUnsignedByteArray()1947 || type != GraphicsContext3D::UNSIGNED_BYTE && !pixels->isUnsignedShortArray()) {1946 if ((type == GraphicsContext3D::UNSIGNED_BYTE && !pixels->isUnsignedByteArray()) 1947 || (type != GraphicsContext3D::UNSIGNED_BYTE && !pixels->isUnsignedShortArray())) { 1948 1948 m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION); 1949 1949 return; … … 2222 2222 case GraphicsContext3D::TEXTURE_WRAP_S: 2223 2223 case GraphicsContext3D::TEXTURE_WRAP_T: 2224 if ( isFloat && paramf != GraphicsContext3D::CLAMP_TO_EDGE && paramf != GraphicsContext3D::MIRRORED_REPEAT && paramf != GraphicsContext3D::REPEAT2225 || !isFloat && parami != GraphicsContext3D::CLAMP_TO_EDGE && parami != GraphicsContext3D::MIRRORED_REPEAT && parami != GraphicsContext3D::REPEAT) {2224 if ((isFloat && paramf != GraphicsContext3D::CLAMP_TO_EDGE && paramf != GraphicsContext3D::MIRRORED_REPEAT && paramf != GraphicsContext3D::REPEAT) 2225 || (!isFloat && parami != GraphicsContext3D::CLAMP_TO_EDGE && parami != GraphicsContext3D::MIRRORED_REPEAT && parami != GraphicsContext3D::REPEAT)) { 2226 2226 m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM); 2227 2227 return; … … 3013 3013 bool resetActiveUnit = false; 3014 3014 for (unsigned ii = 0; ii < m_textureUnits.size(); ++ii) { 3015 if ( m_textureUnits[ii].m_texture2DBinding && m_textureUnits[ii].m_texture2DBinding->needToUseBlackTexture()3016 || m_textureUnits[ii].m_textureCubeMapBinding && m_textureUnits[ii].m_textureCubeMapBinding->needToUseBlackTexture()) {3015 if ((m_textureUnits[ii].m_texture2DBinding && m_textureUnits[ii].m_texture2DBinding->needToUseBlackTexture()) 3016 || (m_textureUnits[ii].m_textureCubeMapBinding && m_textureUnits[ii].m_textureCubeMapBinding->needToUseBlackTexture())) { 3017 3017 if (ii != m_activeTextureUnit) { 3018 3018 m_context->activeTexture(ii);
Note: See TracChangeset
for help on using the changeset viewer.