Changeset 260852 in webkit
- Timestamp:
- Apr 28, 2020 3:42:23 PM (4 years ago)
- Location:
- trunk/Source
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/ThirdParty/ANGLE/ChangeLog
r260773 r260852 1 2020-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 1 13 2020-04-27 Dean Jackson <dino@apple.com> 2 14 -
trunk/Source/ThirdParty/ANGLE/PlatformGTK.cmake
r252717 r260852 19 19 ${angle_system_utils_sources_linux} 20 20 ${angle_system_utils_sources_posix} 21 ${libangle_gl_egl_dl_sources} 22 ${libangle_gl_egl_sources} 23 ${libangle_gl_glx_sources} 21 24 ${libangle_gl_sources} 22 ${libangle_gl_glx_sources}23 25 ) 24 26 -
trunk/Source/WebCore/ChangeLog
r260851 r260852 1 2020-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 1 22 2020-04-28 Noam Rosenthal <noam@webkit.org> 2 23 -
trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp
r259139 r260852 426 426 void ExtensionsGLANGLE::getInteger64vRobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data) 427 427 { 428 gl::GetInteger64vRobustANGLE(pname, bufSize, length, data);428 gl::GetInteger64vRobustANGLE(pname, bufSize, length, reinterpret_cast<GLint64*>(data)); 429 429 } 430 430 431 431 void ExtensionsGLANGLE::getInteger64i_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data) 432 432 { 433 gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, data);433 gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, reinterpret_cast<GLint64*>(data)); 434 434 } 435 435 436 436 void ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params) 437 437 { 438 gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, params);438 gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, reinterpret_cast<GLint64*>(params)); 439 439 } 440 440 … … 602 602 void ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params) 603 603 { 604 gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, params);604 gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLint64*>(params)); 605 605 } 606 606 607 607 void ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint64 *params) 608 608 { 609 gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, params);609 gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLuint64*>(params)); 610 610 } 611 611 -
trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGC3DLayer.cpp
r254064 r260852 95 95 TextureMapperGL::Flags flags = m_context.contextAttributes().alpha ? TextureMapperGL::ShouldBlend : 0; 96 96 #if USE(ANGLE) 97 std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(textureSize, Unaccelerated);97 std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(textureSize, RenderingMode::Unaccelerated); 98 98 if (!imageBuffer) 99 99 return;
Note: See TracChangeset
for help on using the changeset viewer.