Changeset 67194 in webkit


Ignore:
Timestamp:
Sep 10, 2010 5:54:16 AM (14 years ago)
Author:
andreas.kling@nokia.com
Message:

2010-09-10 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Antonio Gomes.

WebGL: Fix GCC warnings about suggested parentheses around && within

https://bugs.webkit.org/show_bug.cgi?id=45534

  • html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::getVertexAttrib): (WebCore::WebGLRenderingContext::readPixels): (WebCore::WebGLRenderingContext::texParameter): (WebCore::WebGLRenderingContext::handleNPOTTextures):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r67191 r67194  
     12010-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
    1142010-09-09  Alexander Pavlov  <apavlov@chromium.org>
    215
  • trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

    r66746 r67194  
    17571757    switch (pname) {
    17581758    case GraphicsContext3D::VERTEX_ATTRIB_ARRAY_BUFFER_BINDING:
    1759         if (!isGLES2Compliant() && !index && m_vertexAttribState[0].bufferBinding == m_vertexAttrib0Buffer
     1759        if ((!isGLES2Compliant() && !index && m_vertexAttribState[0].bufferBinding == m_vertexAttrib0Buffer)
    17601760            || index >= m_vertexAttribState.size()
    17611761            || !m_vertexAttribState[index].bufferBinding
     
    19441944    }
    19451945    // 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())) {
    19481948        m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
    19491949        return;
     
    22222222    case GraphicsContext3D::TEXTURE_WRAP_S:
    22232223    case GraphicsContext3D::TEXTURE_WRAP_T:
    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) {
     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)) {
    22262226            m_context->synthesizeGLError(GraphicsContext3D::INVALID_ENUM);
    22272227            return;
     
    30133013    bool resetActiveUnit = false;
    30143014    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())) {
    30173017            if (ii != m_activeTextureUnit) {
    30183018                m_context->activeTexture(ii);
Note: See TracChangeset for help on using the changeset viewer.