Changeset 69546 in webkit


Ignore:
Timestamp:
Oct 11, 2010 5:58:16 PM (13 years ago)
Author:
oliver@apple.com
Message:

2010-10-11 Oliver Hunt <oliver@apple.com>

Reviewed by Adam Barth.

Make fast/canvas/webgl/glsl-conformance pass again
https://bugs.webkit.org/show_bug.cgi?id=47525

Remove incorrect call to glGetShaderiv, so it is only
called in the case where we don't have our own simulated
log.

  • platform/graphics/opengl/GraphicsContext3DOpenGL.cpp: (WebCore::GraphicsContext3D::getShaderInfoLog):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r69545 r69546  
     12010-10-11  Oliver Hunt  <oliver@apple.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        Make fast/canvas/webgl/glsl-conformance pass again
     6        https://bugs.webkit.org/show_bug.cgi?id=47525
     7
     8        Remove incorrect call to glGetShaderiv, so it is only
     9        called in the case where we don't have our own simulated
     10        log.
     11
     12        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
     13        (WebCore::GraphicsContext3D::getShaderInfoLog):
     14
    1152010-10-11  Sam Weinig  <sam@webkit.org>
    216
  • trunk/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

    r69507 r69546  
    12281228
    12291229    makeContextCurrent();
    1230     GLint length;
    1231     ::glGetShaderiv((GLuint) shader, GL_INFO_LOG_LENGTH, &length);
    1232     if (!length)
    1233         return "";
    12341230
    12351231    HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
     
    12541250         fastFree(info);
    12551251         return s;
    1256      }
    1257      else {
     1252     } else
    12581253         return entry.log;
    1259      }
    12601254}
    12611255
Note: See TracChangeset for help on using the changeset viewer.