Log 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
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (260851 => 260852)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-28 22:34:52 UTC (rev 260851)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-04-28 22:42:23 UTC (rev 260852)
@@ -1,3 +1,15 @@
+2020-04-28 ChangSeok Oh <changs...@webkit.org>
+
+ [GTK] Fix build failures for ANGLE_WEBGL after r259589
+ https://bugs.webkit.org/show_bug.cgi?id=211116
+
+ Reviewed by Alex Christensen.
+
+ 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.
+
2020-04-27 Dean Jackson <d...@apple.com>
Temporarily skip GL_DEPTH_COMPONENT32_OES requirement for depth textures on iOS
Modified: trunk/Source/ThirdParty/ANGLE/PlatformGTK.cmake (260851 => 260852)
--- trunk/Source/ThirdParty/ANGLE/PlatformGTK.cmake 2020-04-28 22:34:52 UTC (rev 260851)
+++ trunk/Source/ThirdParty/ANGLE/PlatformGTK.cmake 2020-04-28 22:42:23 UTC (rev 260852)
@@ -18,8 +18,10 @@
list(APPEND ANGLE_SOURCES
${angle_system_utils_sources_linux}
${angle_system_utils_sources_posix}
+ ${libangle_gl_egl_dl_sources}
+ ${libangle_gl_egl_sources}
+ ${libangle_gl_glx_sources}
${libangle_gl_sources}
- ${libangle_gl_glx_sources}
)
list(APPEND ANGLE_DEFINITIONS
Modified: trunk/Source/WebCore/ChangeLog (260851 => 260852)
--- trunk/Source/WebCore/ChangeLog 2020-04-28 22:34:52 UTC (rev 260851)
+++ trunk/Source/WebCore/ChangeLog 2020-04-28 22:42:23 UTC (rev 260852)
@@ -1,3 +1,24 @@
+2020-04-28 ChangSeok Oh <changs...@webkit.org>
+
+ [GTK] Fix build failures for ANGLE_WEBGL after r259589
+ https://bugs.webkit.org/show_bug.cgi?id=211116
+
+ Reviewed by Alex Christensen.
+
+ 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
+
2020-04-28 Noam Rosenthal <n...@webkit.org>
Implement FCP (first contentful paint)
Modified: trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp (260851 => 260852)
--- trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp 2020-04-28 22:34:52 UTC (rev 260851)
+++ trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp 2020-04-28 22:42:23 UTC (rev 260852)
@@ -425,17 +425,17 @@
void ExtensionsGLANGLE::getInteger64vRobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data)
{
- gl::GetInteger64vRobustANGLE(pname, bufSize, length, data);
+ gl::GetInteger64vRobustANGLE(pname, bufSize, length, reinterpret_cast<GLint64*>(data));
}
void ExtensionsGLANGLE::getInteger64i_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data)
{
- gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, data);
+ gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, reinterpret_cast<GLint64*>(data));
}
void ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
{
- gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, params);
+ gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
}
void ExtensionsGLANGLE::samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param)
@@ -601,12 +601,12 @@
void ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
{
- gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, params);
+ gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
}
void ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint64 *params)
{
- gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, params);
+ gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLuint64*>(params));
}
Modified: trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp (260851 => 260852)
--- trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp 2020-04-28 22:34:52 UTC (rev 260851)
+++ trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp 2020-04-28 22:42:23 UTC (rev 260852)
@@ -94,7 +94,7 @@
IntSize textureSize(m_context.m_currentWidth, m_context.m_currentHeight);
TextureMapperGL::Flags flags = m_context.contextAttributes().alpha ? TextureMapperGL::ShouldBlend : 0;
#if USE(ANGLE)
- std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(textureSize, Unaccelerated);
+ std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(textureSize, RenderingMode::Unaccelerated);
if (!imageBuffer)
return;
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes