Changeset 260852 in webkit


Ignore:
Timestamp:
Apr 28, 2020 3:42:23 PM (4 years ago)
Author:
ChangSeok Oh
Message:

[GTK] Fix build failures for ANGLE_WEBGL after r259589
https://bugs.webkit.org/show_bug.cgi?id=211116

Reviewed by Alex Christensen.

Source/ThirdParty/ANGLE:

The ANGLE_WEBGL is broken after ANGLE is updated in r259589. Missing sources
should be added to the build target.

  • PlatformGTK.cmake: Add libangle_gl_egl_sources and libangle_gl_egl_dl_sources.

Source/WebCore:

The compiler is unhappy with coverting GCGLint64 (long long int) to GLInt64 (long int).
Passing GCGLuint62 as GLuint64 is a similar issue.

No new tests since no new functionalities.

  • platform/graphics/angle/ExtensionsGLANGLE.cpp:

(WebCore::ExtensionsGLANGLE::getInteger64vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getInteger64i_vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE):

  • platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp:

(Nicosia::GC3DLayer::swapBuffersIfNeeded): Unaccelerated -> RenderingMode::Unaccelerated

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r260773 r260852  
     12020-04-28  ChangSeok Oh  <changseok@webkit.org>
     2
     3        [GTK] Fix build failures for ANGLE_WEBGL after r259589
     4        https://bugs.webkit.org/show_bug.cgi?id=211116
     5
     6        Reviewed by Alex Christensen.
     7
     8        The ANGLE_WEBGL is broken after ANGLE is updated in r259589. Missing sources
     9        should be added to the build target.
     10
     11        * PlatformGTK.cmake: Add libangle_gl_egl_sources and libangle_gl_egl_dl_sources.
     12
    1132020-04-27  Dean Jackson  <dino@apple.com>
    214
  • trunk/Source/ThirdParty/ANGLE/PlatformGTK.cmake

    r252717 r260852  
    1919        ${angle_system_utils_sources_linux}
    2020        ${angle_system_utils_sources_posix}
     21        ${libangle_gl_egl_dl_sources}
     22        ${libangle_gl_egl_sources}
     23        ${libangle_gl_glx_sources}
    2124        ${libangle_gl_sources}
    22         ${libangle_gl_glx_sources}
    2325    )
    2426
  • trunk/Source/WebCore/ChangeLog

    r260851 r260852  
     12020-04-28  ChangSeok Oh  <changseok@webkit.org>
     2
     3        [GTK] Fix build failures for ANGLE_WEBGL after r259589
     4        https://bugs.webkit.org/show_bug.cgi?id=211116
     5
     6        Reviewed by Alex Christensen.
     7
     8        The compiler is unhappy with coverting GCGLint64 (long long int) to GLInt64 (long int).
     9        Passing GCGLuint62 as GLuint64 is a similar issue.
     10
     11        No new tests since no new functionalities.
     12
     13        * platform/graphics/angle/ExtensionsGLANGLE.cpp:
     14        (WebCore::ExtensionsGLANGLE::getInteger64vRobustANGLE):
     15        (WebCore::ExtensionsGLANGLE::getInteger64i_vRobustANGLE):
     16        (WebCore::ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE):
     17        (WebCore::ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE):
     18        (WebCore::ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE):
     19        * platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp:
     20        (Nicosia::GC3DLayer::swapBuffersIfNeeded): Unaccelerated -> RenderingMode::Unaccelerated
     21
    1222020-04-28  Noam Rosenthal  <noam@webkit.org>
    223
  • trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp

    r259139 r260852  
    426426void ExtensionsGLANGLE::getInteger64vRobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data)
    427427{
    428     gl::GetInteger64vRobustANGLE(pname, bufSize, length, data);
     428    gl::GetInteger64vRobustANGLE(pname, bufSize, length, reinterpret_cast<GLint64*>(data));
    429429}
    430430
    431431void ExtensionsGLANGLE::getInteger64i_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data)
    432432{
    433     gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, data);
     433    gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, reinterpret_cast<GLint64*>(data));
    434434}
    435435
    436436void ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
    437437{
    438     gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, params);
     438    gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
    439439}
    440440
     
    602602void ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
    603603{
    604     gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, params);
     604    gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
    605605}
    606606
    607607void ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint64 *params)
    608608{
    609     gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, params);
     609    gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLuint64*>(params));
    610610}
    611611
  • trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp

    r254064 r260852  
    9595    TextureMapperGL::Flags flags = m_context.contextAttributes().alpha ? TextureMapperGL::ShouldBlend : 0;
    9696#if USE(ANGLE)
    97     std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(textureSize, Unaccelerated);
     97    std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(textureSize, RenderingMode::Unaccelerated);
    9898    if (!imageBuffer)
    9999        return;
Note: See TracChangeset for help on using the changeset viewer.