Changeset 247315 in webkit

Timestamp:

Jul 10, 2019 11:43:02 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Hook up WebGL's back buffer in ANGLE backend on macOS
​https://bugs.webkit.org/show_bug.cgi?id=198982

Patch by Kenneth Russell <​kbr@chromium.org> on 2019-07-10
Reviewed by Alex Christensen.

Source/ThirdParty/ANGLE:

Add source files needed to implement and call ANGLE extensions, and
export headers necessary for those extensions. Update the script which
adjusts include paths to handle the new headers.

Cherry-pick fix for ANGLE bug crbug.com/angleproject/3669 to support
antialias:true for ANGLE-backed WebGL contexts.

• ANGLE.xcodeproj/project.pbxproj:
• adjust-angle-include-paths.sh:
• src/libANGLE/FramebufferAttachment.cpp:

(gl::FramebufferAttachment::getTextureImageIndex const): Deleted.

• src/libANGLE/FramebufferAttachment.h:

(gl::FramebufferAttachment::getTextureImageIndex const):

• src/libANGLE/validationES2.cpp:

(gl::ValidateBlitFramebufferANGLE):

Source/WebCore:

Fix a few places which were accidentally calling desktop OpenGL rather
than ANGLE. Fix some calls which were using ANGLE's OpenGL ES 3.0
entry points rather than the OpenGL ES 2.0 extension APIs, causing
them to generate errors in WebGL 1.0's backend. Change
Extensions3DANGLE to use ANGLE's requestable extension mechanism.

Fix framebuffer setup when using ANGLE for WebGL 1.0 contexts, for
both antialias:true and false.

Remove ANGLEWebKitBridge in ANGLE backend. It interfered with the
correct operation of ANGLE's internal shader compiler, and was
unnecessary given the use of ANGLE. Remove all manual shader name
hashing and mapping in ANGLE backend.

Tested with parts of the WebGL conformance suite and the San
Angeles demo, which now runs properly with WebKit's ANGLE backend
for WebGL.

• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::getProgramParameter):
(WebCore::WebGLRenderingContextBase::getUniformLocation):
(WebCore::WebGLRenderingContextBase::linkProgramWithoutInvalidatingAttribLocations):

• platform/graphics/GraphicsContext3D.h:
• platform/graphics/angle/Extensions3DANGLE.cpp:

(WebCore::Extensions3DANGLE::Extensions3DANGLE):
(WebCore::Extensions3DANGLE::supports):
(WebCore::Extensions3DANGLE::ensureEnabled):
(WebCore::Extensions3DANGLE::isEnabled):
(WebCore::Extensions3DANGLE::getTranslatedShaderSourceANGLE):
(WebCore::Extensions3DANGLE::initializeAvailableExtensions):
(WebCore::Extensions3DANGLE::blitFramebuffer):
(WebCore::Extensions3DANGLE::renderbufferStorageMultisample):
(WebCore::Extensions3DANGLE::createVertexArrayOES):
(WebCore::Extensions3DANGLE::deleteVertexArrayOES):
(WebCore::Extensions3DANGLE::isVertexArrayOES):
(WebCore::Extensions3DANGLE::bindVertexArrayOES):
(WebCore::Extensions3DANGLE::supportsExtension):
(WebCore::Extensions3DANGLE::drawBuffersEXT):
(WebCore::Extensions3DANGLE::drawArraysInstanced):
(WebCore::Extensions3DANGLE::drawElementsInstanced):
(WebCore::Extensions3DANGLE::vertexAttribDivisor):

• platform/graphics/angle/Extensions3DANGLE.h:
• platform/graphics/angle/GraphicsContext3DANGLE.cpp:

(WebCore::GraphicsContext3D::validateAttributes):
(WebCore::GraphicsContext3D::reshapeFBOs):
(WebCore::GraphicsContext3D::attachDepthAndStencilBufferIfNeeded):
(WebCore::GraphicsContext3D::resolveMultisamplingIfNecessary):
(WebCore::GraphicsContext3D::validateDepthStencil):
(WebCore::GraphicsContext3D::prepareTexture):
(WebCore::GraphicsContext3D::attachShader):
(WebCore::GraphicsContext3D::bindAttribLocation):
(WebCore::GraphicsContext3D::compileShader):
(WebCore::GraphicsContext3D::compileShaderDirect):
(WebCore::GraphicsContext3D::detachShader):
(WebCore::GraphicsContext3D::getActiveAttribImpl):
(WebCore::GraphicsContext3D::getActiveAttrib):
(WebCore::GraphicsContext3D::getActiveUniformImpl):
(WebCore::GraphicsContext3D::getActiveUniform):
(WebCore::GraphicsContext3D::getAttribLocation):
(WebCore::GraphicsContext3D::getAttribLocationDirect):
(WebCore::GraphicsContext3D::moveErrorsToSyntheticErrorList):
(WebCore::GraphicsContext3D::linkProgram):
(WebCore::GraphicsContext3D::shaderSource):
(WebCore::GraphicsContext3D::getUnmangledInfoLog):
(WebCore::GraphicsContext3D::getShaderiv):
(WebCore::GraphicsContext3D::getShaderInfoLog):
(WebCore::GraphicsContext3D::getUniformLocation):
(WebCore::GraphicsContext3D::createBuffer):
(WebCore::GraphicsContext3D::createFramebuffer):
(WebCore::GraphicsContext3D::createProgram):
(WebCore::GraphicsContext3D::createRenderbuffer):
(WebCore::GraphicsContext3D::createShader):
(WebCore::GraphicsContext3D::createTexture):
(WebCore::GraphicsContext3D::deleteBuffer):
(WebCore::GraphicsContext3D::deleteFramebuffer):
(WebCore::GraphicsContext3D::deleteProgram):
(WebCore::GraphicsContext3D::deleteRenderbuffer):
(WebCore::GraphicsContext3D::deleteShader):
(WebCore::GraphicsContext3D::deleteTexture):
(WebCore::GraphicsContext3D::synthesizeGLError):
(): Deleted.
(WebCore::setCurrentNameHashMapForShader): Deleted.
(WebCore::nameHashForShader): Deleted.
(WebCore::GraphicsContext3D::checkVaryingsPacking const): Deleted.
(WebCore::GraphicsContext3D::precisionsMatch const): Deleted.
(WebCore::generateHashedName): Deleted.
(WebCore::GraphicsContext3D::mappedSymbolInShaderSourceMap): Deleted.
(WebCore::GraphicsContext3D::mappedSymbolName): Deleted.
(WebCore::GraphicsContext3D::originalSymbolInShaderSourceMap): Deleted.
(WebCore::GraphicsContext3D::originalSymbolName): Deleted.
(WebCore::GraphicsContext3D::getNonBuiltInActiveSymbolCount): Deleted.
(WebCore::GraphicsContext3D::getShaderSource): Deleted.

• platform/graphics/cocoa/GraphicsContext3DCocoa.mm:

(WebCore::GraphicsContext3D::GraphicsContext3D):
(WebCore::GraphicsContext3D::~GraphicsContext3D):
(WebCore::GraphicsContext3D::makeContextCurrent):
(WebCore::GraphicsContext3D::checkGPUStatus):
(WebCore::GraphicsContext3D::allocateIOSurfaceBackingStore):
(WebCore::GraphicsContext3D::updateFramebufferTextureBackingStoreFromLayer):

• platform/graphics/cocoa/WebGLLayer.h:
• platform/graphics/cocoa/WebGLLayer.mm:

(-[WebGLLayer initWithGraphicsContext3D:]):
(-[WebGLLayer copyImageSnapshotWithColorSpace:]):
(-[WebGLLayer display]):
(-[WebGLLayer setEGLDisplay:andConfig:]):
(-[WebGLLayer dealloc]):
(-[WebGLLayer allocateIOSurfaceBackingStoreWithSize:usingAlpha:]):
(-[WebGLLayer bindFramebufferToNextAvailableSurface]):

Location:

trunk/Source

Files:

• ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (modified) (17 diffs)
• ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• ThirdParty/ANGLE/adjust-angle-include-paths.sh (modified) (1 diff)
• ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.cpp (modified) (1 diff)
• ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.h (modified) (1 diff)
• ThirdParty/ANGLE/src/libANGLE/validationES2.cpp (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (3 diffs)
• WebCore/platform/graphics/GraphicsContext3D.h (modified) (10 diffs)
• WebCore/platform/graphics/angle/Extensions3DANGLE.cpp (modified) (16 diffs)
• WebCore/platform/graphics/angle/Extensions3DANGLE.h (modified) (1 diff)
• WebCore/platform/graphics/angle/GraphicsContext3DANGLE.cpp (modified) (45 diffs)
• WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm (modified) (14 diffs)
• WebCore/platform/graphics/cocoa/WebGLLayer.h (modified) (3 diffs)
• WebCore/platform/graphics/cocoa/WebGLLayer.mm (modified) (9 diffs)

trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

@@ -511 +511 @@
                 5CB305021DE4164800D2C405 /* TransformFeedbackImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB304D81DE4164800D2C405 /* TransformFeedbackImpl.h */; };
                 5CB305031DE4164800D2C405 /* VertexArrayImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB304D91DE4164800D2C405 /* VertexArrayImpl.h */; };
-                5CB5E1A71DFB8AF600F90FC9 /* libEGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB300B51DE39E6300D2C405 /* libEGL.cpp */; };
                 5CC7D457191024E4000B8C1F /* ValidateOutputs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC7D450191024E4000B8C1F /* ValidateOutputs.cpp */; };
                 5CC7D458191024E4000B8C1F /* ValidateOutputs.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC7D451191024E4000B8C1F /* ValidateOutputs.h */; };
@@ -591 +590 @@
                 5CCD81B51DBFEA5C006066B8 /* QualifierTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD819E1DBFEA5C006066B8 /* QualifierTypes.cpp */; };
                 5CCD81B61DBFEA5C006066B8 /* QualifierTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD819F1DBFEA5C006066B8 /* QualifierTypes.h */; };
+                6E344AB122BC35C3001DDB2C /* entry_points_enum_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E344AAD22BC35C3001DDB2C /* entry_points_enum_autogen.h */; };
+                6E344AB222BC35C3001DDB2C /* entry_points_gles_ext_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E344AAE22BC35C3001DDB2C /* entry_points_gles_ext_autogen.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                6E344AB322BC35C3001DDB2C /* entry_points_gles_ext_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E344AAF22BC35C3001DDB2C /* entry_points_gles_ext_autogen.cpp */; };
+                6E344AB622BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E344AB422BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp */; };
+                6E344AB722BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E344AB522BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h */; };
+                6ED70A0C22CD630E008688CE /* gl.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ED70A0922CD630E008688CE /* gl.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                6ED70A0D22CD630E008688CE /* glext.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ED70A0A22CD630E008688CE /* glext.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                6ED70A0E22CD630E008688CE /* glplatform.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ED70A0B22CD630E008688CE /* glplatform.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                6ED70A1022CD6822008688CE /* glext_angle.h in Headers */ = {isa = PBXBuildFile; fileRef = 6ED70A0F22CD6822008688CE /* glext_angle.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                6EE2FD2D22BAE99C001D369E /* eglext_angle.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE2FD2C22BAE99C001D369E /* eglext_angle.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                6EE2FD2F22BAE9CD001D369E /* gl2ext_angle.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE2FD2E22BAE9CD001D369E /* gl2ext_angle.h */; settings = {ATTRIBUTES = (Public, ); }; };
                 72309A56183C27DE00370B93 /* Tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72309A55183C27DB00370B93 /* Tokenizer.cpp */; settings = {COMPILER_FLAGS = "-Wno-unreachable-code"; }; };
                 72309A58183C27F300370B93 /* ExpressionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72309A57183C27F100370B93 /* ExpressionParser.cpp */; settings = {COMPILER_FLAGS = "-Wno-unreachable-code"; }; };
@@ -1050 +1060 @@
                 5C9FFF4C19102A000025B8FA /* FlagStd140Structs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlagStd140Structs.cpp; sourceTree = "<group>"; };
                 5C9FFF4D19102A000025B8FA /* FlagStd140Structs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlagStd140Structs.h; sourceTree = "<group>"; };
-                5CB300B51DE39E6300D2C405 /* libEGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libEGL.cpp; sourceTree = "<group>"; };
                 5CB300B81DE39E6300D2C405 /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = "<group>"; };
                 5CB300BB1DE39E7500D2C405 /* entry_points_egl_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entry_points_egl_ext.cpp; sourceTree = "<group>"; };
@@ -1238 +1247 @@
                 5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
                 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
+                6E344AAD22BC35C3001DDB2C /* entry_points_enum_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entry_points_enum_autogen.h; sourceTree = "<group>"; };
+                6E344AAE22BC35C3001DDB2C /* entry_points_gles_ext_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entry_points_gles_ext_autogen.h; sourceTree = "<group>"; };
+                6E344AAF22BC35C3001DDB2C /* entry_points_gles_ext_autogen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entry_points_gles_ext_autogen.cpp; sourceTree = "<group>"; };
+                6E344AB422BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entry_points_gles_1_0_autogen.cpp; sourceTree = "<group>"; };
+                6E344AB522BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entry_points_gles_1_0_autogen.h; sourceTree = "<group>"; };
+                6ED70A0922CD630E008688CE /* gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl.h; path = include/GLES/gl.h; sourceTree = "<group>"; };
+                6ED70A0A22CD630E008688CE /* glext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glext.h; path = include/GLES/glext.h; sourceTree = "<group>"; };
+                6ED70A0B22CD630E008688CE /* glplatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glplatform.h; path = include/GLES/glplatform.h; sourceTree = "<group>"; };
+                6ED70A0F22CD6822008688CE /* glext_angle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glext_angle.h; path = include/GLES/glext_angle.h; sourceTree = "<group>"; };
+                6EE2FD2C22BAE99C001D369E /* eglext_angle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eglext_angle.h; path = include/EGL/eglext_angle.h; sourceTree = "<group>"; };
+                6EE2FD2E22BAE9CD001D369E /* gl2ext_angle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl2ext_angle.h; path = include/GLES2/gl2ext_angle.h; sourceTree = "<group>"; };
                 72309A55183C27DB00370B93 /* Tokenizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Tokenizer.cpp; sourceTree = "<group>"; };
                 72309A57183C27F100370B93 /* ExpressionParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExpressionParser.cpp; sourceTree = "<group>"; };
@@ -1506 +1526 @@
                                 5C1BAAA61DFB6124002906BB /* egl.h */,
                                 5C1BAAA71DFB6124002906BB /* eglext.h */,
+                                6EE2FD2C22BAE99C001D369E /* eglext_angle.h */,
                                 5C1BAAA81DFB6124002906BB /* eglplatform.h */,
                         );
@@ -1516 +1537 @@
                                 5C1BAA9E1DFB610E002906BB /* gl2.h */,
                                 5C1BAA9F1DFB610E002906BB /* gl2ext.h */,
+                                6EE2FD2E22BAE9CD001D369E /* gl2ext_angle.h */,
                                 5C1BAAA01DFB610E002906BB /* gl2platform.h */,
                         );
@@ -1697 +1719 @@
                         isa = PBXGroup;
                         children = (
-                                5CB300B51DE39E6300D2C405 /* libEGL.cpp */,
                                 5CB300B81DE39E6300D2C405 /* resource.h */,
                         );
@@ -1710 +1731 @@
                                 5CB300BB1DE39E7500D2C405 /* entry_points_egl_ext.cpp */,
                                 5CB300BC1DE39E7500D2C405 /* entry_points_egl_ext.h */,
+                                6E344AAD22BC35C3001DDB2C /* entry_points_enum_autogen.h */,
+                                6E344AB422BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp */,
+                                6E344AB522BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h */,
                                 315EBE021FCE456200AC7A89 /* entry_points_gles_2_0_autogen.cpp */,
                                 315EBDFE1FCE456100AC7A89 /* entry_points_gles_2_0_autogen.h */,
@@ -1716 +1740 @@
                                 315EBE011FCE456100AC7A89 /* entry_points_gles_3_1_autogen.cpp */,
                                 315EBDFF1FCE456100AC7A89 /* entry_points_gles_3_1_autogen.h */,
+                                6E344AAF22BC35C3001DDB2C /* entry_points_gles_ext_autogen.cpp */,
+                                6E344AAE22BC35C3001DDB2C /* entry_points_gles_ext_autogen.h */,
                                 5CB300C71DE39E7500D2C405 /* global_state.cpp */,
                                 5CB300C81DE39E7500D2C405 /* global_state.h */,
@@ -2074 +2100 @@
                         sourceTree = "<group>";
                 };
+                6ED70A0822CD62E8008688CE /* GLES */ = {
+                        isa = PBXGroup;
+                        children = (
+                                6ED70A0922CD630E008688CE /* gl.h */,
+                                6ED70A0A22CD630E008688CE /* glext.h */,
+                                6ED70A0F22CD6822008688CE /* glext_angle.h */,
+                                6ED70A0B22CD630E008688CE /* glplatform.h */,
+                        );
+                        name = GLES;
+                        sourceTree = "<group>";
+                };
                 A08C3CD816D6CB35003F0B83 /* third_party */ = {
                         isa = PBXGroup;
@@ -2105 +2142 @@
                         children = (
                                 5C1BAA931DFB60E2002906BB /* EGL */,
+                                6ED70A0822CD62E8008688CE /* GLES */,
                                 5C1BAA941DFB60EA002906BB /* GLES2 */,
                                 5C1BAA951DFB60EF002906BB /* GLES3 */,
@@ -2270 +2308 @@
                                 5C1BAAAA1DFB6124002906BB /* egl.h in Headers */,
                                 5C1BAAAB1DFB6124002906BB /* eglext.h in Headers */,
+                                6EE2FD2D22BAE99C001D369E /* eglext_angle.h in Headers */,
                                 5CB304E31DE4164800D2C405 /* EGLImplFactory.h in Headers */,
                                 5C1BAAAC1DFB6124002906BB /* eglplatform.h in Headers */,
@@ -2278 +2317 @@
                                 5CB304981DE4157B00D2C405 /* entry_points_egl.h in Headers */,
                                 5CB304961DE4157B00D2C405 /* entry_points_egl_ext.h in Headers */,
+                                6E344AB122BC35C3001DDB2C /* entry_points_enum_autogen.h in Headers */,
+                                6E344AB722BC57C8001DDB2C /* entry_points_gles_1_0_autogen.h in Headers */,
                                 315EBE061FCE456200AC7A89 /* entry_points_gles_2_0_autogen.h in Headers */,
                                 315EBE051FCE456200AC7A89 /* entry_points_gles_3_0_autogen.h in Headers */,
                                 315EBE071FCE456200AC7A89 /* entry_points_gles_3_1_autogen.h in Headers */,
+                                6E344AB222BC35C3001DDB2C /* entry_points_gles_ext_autogen.h in Headers */,
                                 5C1DBDEB1B0438D300235552 /* Error.h in Headers */,
                                 315EBDE91FCE452D00AC7A89 /* ErrorStrings.h in Headers */,
@@ -2313 +2355 @@
                                 5CB3012A1DE39F1A00D2C405 /* functionsgl_typedefs.h in Headers */,
                                 5CCD59942284FC400018F2D8 /* generatemip.h in Headers */,
+                                6ED70A0C22CD630E008688CE /* gl.h in Headers */,
                                 5C1BAAA21DFB610E002906BB /* gl2.h in Headers */,
                                 5C1BAAA31DFB610E002906BB /* gl2ext.h in Headers */,
+                                6EE2FD2F22BAE9CD001D369E /* gl2ext_angle.h in Headers */,
                                 5C1BAAA41DFB610E002906BB /* gl2platform.h in Headers */,
                                 5C1BAA9A1DFB60FF002906BB /* gl3.h in Headers */,
@@ -2322 +2366 @@
                                 5CCD59602284F7960018F2D8 /* GLES1Renderer.h in Headers */,
                                 5CCD59622284F7960018F2D8 /* GLES1State.h in Headers */,
+                                6ED70A0D22CD630E008688CE /* glext.h in Headers */,
+                                6ED70A1022CD6822008688CE /* glext_angle.h in Headers */,
                                 5CB304EC1DE4164800D2C405 /* GLImplFactory.h in Headers */,
                                 5CB304A21DE4157B00D2C405 /* global_state.h in Headers */,
+                                6ED70A0E22CD630E008688CE /* glplatform.h in Headers */,
                                 31012E2D18B97B9B0039062F /* glslang.h in Headers */,
                                 31012E3218B97B9B0039062F /* glslang_tab.h in Headers */,
@@ -2684 +2731 @@
                                 5C1BAAB51DFB6F54002906BB /* entry_points_egl.cpp in Sources */,
                                 5C1BAAB61DFB6F58002906BB /* entry_points_egl_ext.cpp in Sources */,
+                                6E344AB622BC57C8001DDB2C /* entry_points_gles_1_0_autogen.cpp in Sources */,
                                 315EBE0A1FCE456200AC7A89 /* entry_points_gles_2_0_autogen.cpp in Sources */,
                                 315EBE081FCE456200AC7A89 /* entry_points_gles_3_0_autogen.cpp in Sources */,
                                 315EBE091FCE456200AC7A89 /* entry_points_gles_3_1_autogen.cpp in Sources */,
+                                6E344AB322BC35C3001DDB2C /* entry_points_gles_ext_autogen.cpp in Sources */,
                                 5C1DBDEA1B0438D300235552 /* Error.cpp in Sources */,
                                 315EBDEF1FCE452D00AC7A89 /* es3_copy_conversion_table_autogen.cpp in Sources */,
@@ -2737 +2786 @@
                                 315EBD9C1FCE443600AC7A89 /* IsASTDepthBelowLimit.cpp in Sources */,
                                 A264F8B616974DED006FAA5A /* Lexer.cpp in Sources */,
-                                5CB5E1A71DFB8AF600F90FC9 /* libEGL.cpp in Sources */,
                                 5CB304EF1DE4164800D2C405 /* load_functions_table_autogen.cpp in Sources */,
                                 5CCD59952284FC400018F2D8 /* loadimage.cpp in Sources */,

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2019-07-10  Kenneth Russell  <kbr@chromium.org>
+
+        Hook up WebGL's back buffer in ANGLE backend on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=198982
+
+        Reviewed by Alex Christensen.
+
+        Add source files needed to implement and call ANGLE extensions, and
+        export headers necessary for those extensions. Update the script which
+        adjusts include paths to handle the new headers.
+
+        Cherry-pick fix for ANGLE bug crbug.com/angleproject/3669 to support
+        antialias:true for ANGLE-backed WebGL contexts.
+
+        * ANGLE.xcodeproj/project.pbxproj:
+        * adjust-angle-include-paths.sh:
+        * src/libANGLE/FramebufferAttachment.cpp:
+        (gl::FramebufferAttachment::getTextureImageIndex const): Deleted.
+        * src/libANGLE/FramebufferAttachment.h:
+        (gl::FramebufferAttachment::getTextureImageIndex const):
+        * src/libANGLE/validationES2.cpp:
+        (gl::ValidateBlitFramebufferANGLE):
+
 2019-06-27  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh

@@ -32 +32 @@
         sed -e '
 s/^#include <EGL\/\(.*\)>/#include <ANGLE\/\1>/
+s/^#include <GLES\/\(.*\)>/#include <ANGLE\/\1>/
 s/^#include <GLES2\/\(.*\)>/#include <ANGLE\/\1>/
 s/^#include <GLES3\/\(.*\)>/#include <ANGLE\/\1>/

trunk/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.cpp

@@ -179 +179 @@
 }
 
-const ImageIndex &FramebufferAttachment::getTextureImageIndex() const
-{
-    ASSERT(type() == GL_TEXTURE);
-    return mTarget.textureIndex();
-}
-
 TextureTarget FramebufferAttachment::cubeMapFace() const
 {

trunk/Source/ThirdParty/ANGLE/src/libANGLE/FramebufferAttachment.h

@@ -217 +217 @@
 };
 
+inline const ImageIndex &FramebufferAttachment::getTextureImageIndex() const
+{
+    ASSERT(type() == GL_TEXTURE);
+    return mTarget.textureIndex();
+}
+
 inline Extents FramebufferAttachment::getSize() const
 {

trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES2.cpp

@@ -2573 +2573 @@
         {
             if (!(readColorAttachment->type() == GL_TEXTURE &&
-                  readColorAttachment->getTextureImageIndex().getType() == TextureType::_2D) &&
+                  (readColorAttachment->getTextureImageIndex().getType() == TextureType::_2D ||
+                   readColorAttachment->getTextureImageIndex().getType() == TextureType::Rectangle)) &&
                 readColorAttachment->type() != GL_RENDERBUFFER &&
                 readColorAttachment->type() != GL_FRAMEBUFFER_DEFAULT)
@@ -2590 +2591 @@
                 {
                     if (!(attachment->type() == GL_TEXTURE &&
-                          attachment->getTextureImageIndex().getType() == TextureType::_2D) &&
+                          (attachment->getTextureImageIndex().getType() == TextureType::_2D ||
+                           attachment->getTextureImageIndex().getType() == TextureType::Rectangle)) &&
                         attachment->type() != GL_RENDERBUFFER &&
                         attachment->type() != GL_FRAMEBUFFER_DEFAULT)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-10  Kenneth Russell  <kbr@chromium.org>
+
+        Hook up WebGL's back buffer in ANGLE backend on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=198982
+
+        Reviewed by Alex Christensen.
+
+        Fix a few places which were accidentally calling desktop OpenGL rather
+        than ANGLE. Fix some calls which were using ANGLE's OpenGL ES 3.0
+        entry points rather than the OpenGL ES 2.0 extension APIs, causing
+        them to generate errors in WebGL 1.0's backend. Change
+        Extensions3DANGLE to use ANGLE's requestable extension mechanism.
+
+        Fix framebuffer setup when using ANGLE for WebGL 1.0 contexts, for
+        both antialias:true and false.
+
+        Remove ANGLEWebKitBridge in ANGLE backend. It interfered with the
+        correct operation of ANGLE's internal shader compiler, and was
+        unnecessary given the use of ANGLE. Remove all manual shader name
+        hashing and mapping in ANGLE backend.
+
+        Tested with parts of the WebGL conformance suite and the San
+        Angeles demo, which now runs properly with WebKit's ANGLE backend
+        for WebGL.
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::getProgramParameter):
+        (WebCore::WebGLRenderingContextBase::getUniformLocation):
+        (WebCore::WebGLRenderingContextBase::linkProgramWithoutInvalidatingAttribLocations):
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/angle/Extensions3DANGLE.cpp:
+        (WebCore::Extensions3DANGLE::Extensions3DANGLE):
+        (WebCore::Extensions3DANGLE::supports):
+        (WebCore::Extensions3DANGLE::ensureEnabled):
+        (WebCore::Extensions3DANGLE::isEnabled):
+        (WebCore::Extensions3DANGLE::getTranslatedShaderSourceANGLE):
+        (WebCore::Extensions3DANGLE::initializeAvailableExtensions):
+        (WebCore::Extensions3DANGLE::blitFramebuffer):
+        (WebCore::Extensions3DANGLE::renderbufferStorageMultisample):
+        (WebCore::Extensions3DANGLE::createVertexArrayOES):
+        (WebCore::Extensions3DANGLE::deleteVertexArrayOES):
+        (WebCore::Extensions3DANGLE::isVertexArrayOES):
+        (WebCore::Extensions3DANGLE::bindVertexArrayOES):
+        (WebCore::Extensions3DANGLE::supportsExtension):
+        (WebCore::Extensions3DANGLE::drawBuffersEXT):
+        (WebCore::Extensions3DANGLE::drawArraysInstanced):
+        (WebCore::Extensions3DANGLE::drawElementsInstanced):
+        (WebCore::Extensions3DANGLE::vertexAttribDivisor):
+        * platform/graphics/angle/Extensions3DANGLE.h:
+        * platform/graphics/angle/GraphicsContext3DANGLE.cpp:
+        (WebCore::GraphicsContext3D::validateAttributes):
+        (WebCore::GraphicsContext3D::reshapeFBOs):
+        (WebCore::GraphicsContext3D::attachDepthAndStencilBufferIfNeeded):
+        (WebCore::GraphicsContext3D::resolveMultisamplingIfNecessary):
+        (WebCore::GraphicsContext3D::validateDepthStencil):
+        (WebCore::GraphicsContext3D::prepareTexture):
+        (WebCore::GraphicsContext3D::attachShader):
+        (WebCore::GraphicsContext3D::bindAttribLocation):
+        (WebCore::GraphicsContext3D::compileShader):
+        (WebCore::GraphicsContext3D::compileShaderDirect):
+        (WebCore::GraphicsContext3D::detachShader):
+        (WebCore::GraphicsContext3D::getActiveAttribImpl):
+        (WebCore::GraphicsContext3D::getActiveAttrib):
+        (WebCore::GraphicsContext3D::getActiveUniformImpl):
+        (WebCore::GraphicsContext3D::getActiveUniform):
+        (WebCore::GraphicsContext3D::getAttribLocation):
+        (WebCore::GraphicsContext3D::getAttribLocationDirect):
+        (WebCore::GraphicsContext3D::moveErrorsToSyntheticErrorList):
+        (WebCore::GraphicsContext3D::linkProgram):
+        (WebCore::GraphicsContext3D::shaderSource):
+        (WebCore::GraphicsContext3D::getUnmangledInfoLog):
+        (WebCore::GraphicsContext3D::getShaderiv):
+        (WebCore::GraphicsContext3D::getShaderInfoLog):
+        (WebCore::GraphicsContext3D::getUniformLocation):
+        (WebCore::GraphicsContext3D::createBuffer):
+        (WebCore::GraphicsContext3D::createFramebuffer):
+        (WebCore::GraphicsContext3D::createProgram):
+        (WebCore::GraphicsContext3D::createRenderbuffer):
+        (WebCore::GraphicsContext3D::createShader):
+        (WebCore::GraphicsContext3D::createTexture):
+        (WebCore::GraphicsContext3D::deleteBuffer):
+        (WebCore::GraphicsContext3D::deleteFramebuffer):
+        (WebCore::GraphicsContext3D::deleteProgram):
+        (WebCore::GraphicsContext3D::deleteRenderbuffer):
+        (WebCore::GraphicsContext3D::deleteShader):
+        (WebCore::GraphicsContext3D::deleteTexture):
+        (WebCore::GraphicsContext3D::synthesizeGLError):
+        (): Deleted.
+        (WebCore::setCurrentNameHashMapForShader): Deleted.
+        (WebCore::nameHashForShader): Deleted.
+        (WebCore::GraphicsContext3D::checkVaryingsPacking const): Deleted.
+        (WebCore::GraphicsContext3D::precisionsMatch const): Deleted.
+        (WebCore::generateHashedName): Deleted.
+        (WebCore::GraphicsContext3D::mappedSymbolInShaderSourceMap): Deleted.
+        (WebCore::GraphicsContext3D::mappedSymbolName): Deleted.
+        (WebCore::GraphicsContext3D::originalSymbolInShaderSourceMap): Deleted.
+        (WebCore::GraphicsContext3D::originalSymbolName): Deleted.
+        (WebCore::GraphicsContext3D::getNonBuiltInActiveSymbolCount): Deleted.
+        (WebCore::GraphicsContext3D::getShaderSource): Deleted.
+        * platform/graphics/cocoa/GraphicsContext3DCocoa.mm:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        (WebCore::GraphicsContext3D::~GraphicsContext3D):
+        (WebCore::GraphicsContext3D::makeContextCurrent):
+        (WebCore::GraphicsContext3D::checkGPUStatus):
+        (WebCore::GraphicsContext3D::allocateIOSurfaceBackingStore):
+        (WebCore::GraphicsContext3D::updateFramebufferTextureBackingStoreFromLayer):
+        * platform/graphics/cocoa/WebGLLayer.h:
+        * platform/graphics/cocoa/WebGLLayer.mm:
+        (-[WebGLLayer initWithGraphicsContext3D:]):
+        (-[WebGLLayer copyImageSnapshotWithColorSpace:]):
+        (-[WebGLLayer display]):
+        (-[WebGLLayer setEGLDisplay:andConfig:]):
+        (-[WebGLLayer dealloc]):
+        (-[WebGLLayer allocateIOSurfaceBackingStoreWithSize:usingAlpha:]):
+        (-[WebGLLayer bindFramebufferToNextAvailableSurface]):
+
 2019-07-10  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -2676 +2676 @@
     case GraphicsContext3D::ACTIVE_ATTRIBUTES:
     case GraphicsContext3D::ACTIVE_UNIFORMS:
+#if USE(ANGLE)
+        m_context->getProgramiv(objectOrZero(program), pname, &value);
+#else
         m_context->getNonBuiltInActiveSymbolCount(objectOrZero(program), pname, &value);
+#endif // USE(ANGLE)
         return value;
     default:
@@ -2995 +2999 @@
 
     GC3Dint activeUniforms = 0;
+#if USE(ANGLE)
+    m_context->getProgramiv(objectOrZero(program), GraphicsContext3D::ACTIVE_UNIFORMS, &activeUniforms);
+#else
     m_context->getNonBuiltInActiveSymbolCount(objectOrZero(program), GraphicsContext3D::ACTIVE_UNIFORMS, &activeUniforms);
+#endif
     for (GC3Dint i = 0; i < activeUniforms; i++) {
         ActiveInfo info;
@@ -3209 +3217 @@
     RefPtr<WebGLShader> vertexShader = program->getAttachedShader(GraphicsContext3D::VERTEX_SHADER);
     RefPtr<WebGLShader> fragmentShader = program->getAttachedShader(GraphicsContext3D::FRAGMENT_SHADER);
-    if (!vertexShader || !vertexShader->isValid() || !fragmentShader || !fragmentShader->isValid() || !m_context->precisionsMatch(objectOrZero(vertexShader.get()), objectOrZero(fragmentShader.get())) || !m_context->checkVaryingsPacking(objectOrZero(vertexShader.get()), objectOrZero(fragmentShader.get()))) {
+    if (!vertexShader || !vertexShader->isValid() || !fragmentShader || !fragmentShader->isValid()) {
         program->setLinkStatus(false);
         return false;
     }
+
+#if !USE(ANGLE)
+    if (!m_context->precisionsMatch(objectOrZero(vertexShader.get()), objectOrZero(fragmentShader.get()))
+        || !m_context->checkVaryingsPacking(objectOrZero(vertexShader.get()), objectOrZero(fragmentShader.get()))) {
+        program->setLinkStatus(false);
+        return false;
+    }
+#endif
 
     m_context->linkProgram(objectOrZero(program));

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -72 +72 @@
 #if USE(ANGLE)
 typedef void* PlatformGraphicsContext3D;
+typedef void* PlatformGraphicsContext3DDisplay;
+typedef void* PlatformGraphicsContext3DSurface;
+typedef void* PlatformGraphicsContext3DConfig;
 #endif // USE(ANGLE)
 
@@ -1055 +1058 @@
     void getInteger64v(GC3Denum pname, GC3Dint64* value);
     void getProgramiv(Platform3DObject program, GC3Denum pname, GC3Dint* value);
+#if !USE(ANGLE)
     void getNonBuiltInActiveSymbolCount(Platform3DObject program, GC3Denum pname, GC3Dint* value);
+#endif // !USE(ANGLE)
     String getProgramInfoLog(Platform3DObject);
     String getUnmangledInfoLog(Platform3DObject[2], GC3Dsizei, const String&);
@@ -1062 +1067 @@
     String getShaderInfoLog(Platform3DObject);
     void getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, GC3Dint* range, GC3Dint* precision);
+#if !USE(ANGLE)
     String getShaderSource(Platform3DObject);
+#endif // !USE(ANGLE)
     String getString(GC3Denum name);
     void getTexParameterfv(GC3Denum target, GC3Denum pname, GC3Dfloat* value);
@@ -1128 +1135 @@
     void useProgram(Platform3DObject);
     void validateProgram(Platform3DObject);
+#if !USE(ANGLE)
     bool checkVaryingsPacking(Platform3DObject vertexShader, Platform3DObject fragmentShader) const;
     bool precisionsMatch(Platform3DObject vertexShader, Platform3DObject fragmentShader) const;
+#endif
 
     void vertexAttrib1f(GC3Duint index, GC3Dfloat x);
@@ -1186 +1195 @@
     void updateFramebufferTextureBackingStoreFromLayer();
     void updateCGLContext();
+#endif
+
+#if USE(ANGLE) && PLATFORM(MAC)
+    void allocateIOSurfaceBackingStore(IntSize);
+    void updateFramebufferTextureBackingStoreFromLayer();
 #endif
 #endif // PLATFORM(COCOA)
@@ -1363 +1377 @@
     RetainPtr<WebGLLayer> m_webGLLayer;
     PlatformGraphicsContext3D m_contextObj { nullptr };
-#endif
+#if USE(ANGLE)
+    PlatformGraphicsContext3DDisplay m_displayObj { nullptr };
+#endif // USE(ANGLE)
+#endif // PLATFORM(COCOA)
 
 #if PLATFORM(WIN) && USE(CA)
@@ -1397 +1414 @@
     };
 
+#if !USE(ANGLE)
     // FIXME: Shaders are never removed from this map, even if they and their program are deleted.
     // This is bad, and it also relies on the fact we never reuse Platform3DObject numbers.
@@ -1435 +1453 @@
 
     std::unique_ptr<ShaderNameHash> nameHashMapForShaders;
+#endif // !USE(ANGLE)
 
 #if !PLATFORM(COCOA) && USE(OPENGL_ES)
@@ -1454 +1473 @@
     Vector<Vector<float>> m_vertexArray;
 
+#if !USE(ANGLE)
     ANGLEWebKitBridge m_compiler;
+#endif
 
     GC3Duint m_texture { 0 };
@@ -1469 +1490 @@
     bool m_layerComposited { false };
     GC3Duint m_internalColorFormat { 0 };
+
+#if USE(ANGLE)
+    PlatformGraphicsContext3DSurface m_pbuffer;
+#endif
 
     struct GraphicsContext3DState {

trunk/Source/WebCore/platform/graphics/angle/Extensions3DANGLE.cpp

@@ -33 +33 @@
 #include <ANGLE/entry_points_gles_2_0_autogen.h>
 #include <ANGLE/entry_points_gles_3_0_autogen.h>
+// Skip the inclusion of ANGLE's explicit context entry points for now.
+#define GL_ANGLE_explicit_context
+#define GL_ANGLE_explicit_context_gles1
+typedef void* GLeglContext;
+#include <ANGLE/entry_points_gles_ext_autogen.h>
 
 // Note: this file can't be compiled in the same unified source file
@@ -52 +57 @@
     // FIXME: ideally, remove this initialization altogether. ANGLE
     // subsumes the responsibility for graphics driver workarounds.
-    m_vendor = String(reinterpret_cast<const char*>(::glGetString(GL_VENDOR)));
-    m_renderer = String(reinterpret_cast<const char*>(::glGetString(GL_RENDERER)));
+    m_vendor = String(reinterpret_cast<const char*>(gl::GetString(GL_VENDOR)));
+    m_renderer = String(reinterpret_cast<const char*>(gl::GetString(GL_RENDERER)));
 
     Vector<String> vendorComponents = m_vendor.convertToASCIILowercase().split(' ');
@@ -73 +78 @@
         initializeAvailableExtensions();
 
-    // We explicitly do not support this extension until
-    // we fix the following bug:
-    // https://bugs.webkit.org/show_bug.cgi?id=149734
-    // FIXME: given that ANGLE is in use, rewrite this in terms of
-    // ANGLE queries and enable this extension.
-    if (name == "GL_ANGLE_translated_shader_source")
-        return false;
-
     return supportsExtension(name);
 }
@@ -86 +83 @@
 void Extensions3DANGLE::ensureEnabled(const String& name)
 {
-    if (name == "GL_OES_standard_derivatives") {
-        // Enable support in ANGLE (if not enabled already).
-        ANGLEWebKitBridge& compiler = m_context->m_compiler;
-        ShBuiltInResources ANGLEResources = compiler.getResources();
-        if (!ANGLEResources.OES_standard_derivatives) {
-            ANGLEResources.OES_standard_derivatives = 1;
-            compiler.setResources(ANGLEResources);
-        }
-    } else if (name == "GL_EXT_draw_buffers") {
-        // Enable support in ANGLE (if not enabled already).
-        ANGLEWebKitBridge& compiler = m_context->m_compiler;
-        ShBuiltInResources ANGLEResources = compiler.getResources();
-        if (!ANGLEResources.EXT_draw_buffers) {
-            ANGLEResources.EXT_draw_buffers = 1;
-            m_context->getIntegerv(Extensions3D::MAX_DRAW_BUFFERS_EXT, &ANGLEResources.MaxDrawBuffers);
-            compiler.setResources(ANGLEResources);
-        }
-    } else if (name == "GL_EXT_shader_texture_lod") {
-        // Enable support in ANGLE (if not enabled already).
-        ANGLEWebKitBridge& compiler = m_context->m_compiler;
-        ShBuiltInResources ANGLEResources = compiler.getResources();
-        if (!ANGLEResources.EXT_shader_texture_lod) {
-            ANGLEResources.EXT_shader_texture_lod = 1;
-            compiler.setResources(ANGLEResources);
-        }
-    } else if (name == "GL_EXT_frag_depth") {
-        // Enable support in ANGLE (if not enabled already).
-        ANGLEWebKitBridge& compiler = m_context->m_compiler;
-        ShBuiltInResources ANGLEResources = compiler.getResources();
-        if (!ANGLEResources.EXT_frag_depth) {
-            ANGLEResources.EXT_frag_depth = 1;
-            compiler.setResources(ANGLEResources);
-        }
+    // Enable support in ANGLE (if not enabled already).
+    if (m_requestableExtensions.contains(name) && !m_enabledExtensions.contains(name)) {
+        m_context->makeContextCurrent();
+        gl::RequestExtensionANGLE(name.ascii().data());
+        m_enabledExtensions.add(name);
     }
 }
@@ -124 +93 @@
 bool Extensions3DANGLE::isEnabled(const String& name)
 {
-    if (name == "GL_OES_standard_derivatives") {
-        ANGLEWebKitBridge& compiler = m_context->m_compiler;
-        return compiler.getResources().OES_standard_derivatives;
-    }
-    return supports(name);
+    return m_availableExtensions.contains(name) || m_enabledExtensions.contains(name);
 }
 
@@ -138 +103 @@
 String Extensions3DANGLE::getTranslatedShaderSourceANGLE(Platform3DObject shader)
 {
-    // FIXME: port to use ANGLE's implementation directly.
-    ASSERT(shader);
-    int GLshaderType;
-    ANGLEShaderType shaderType;
-
-    ANGLEWebKitBridge& compiler = m_context->m_compiler;
-
-    m_context->getShaderiv(shader, GraphicsContext3D::SHADER_TYPE, &GLshaderType);
-
-    if (GLshaderType == GraphicsContext3D::VERTEX_SHADER)
-        shaderType = SHADER_TYPE_VERTEX;
-    else if (GLshaderType == GraphicsContext3D::FRAGMENT_SHADER)
-        shaderType = SHADER_TYPE_FRAGMENT;
-    else
-        return emptyString(); // Invalid shader type.
-
-    HashMap<Platform3DObject, GraphicsContext3D::ShaderSourceEntry>::iterator result = m_context->m_shaderSourceMap.find(shader);
-
-    if (result == m_context->m_shaderSourceMap.end())
+    int sourceLength = 0;
+    m_context->getShaderiv(shader, GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE, &sourceLength);
+    if (!sourceLength)
         return emptyString();
-
-    GraphicsContext3D::ShaderSourceEntry& entry = result->value;
-
-    String translatedShaderSource;
-    String shaderInfoLog;
-    uint64_t extraCompileOptions = SH_CLAMP_INDIRECT_ARRAY_BOUNDS | SH_UNFOLD_SHORT_CIRCUIT | SH_INIT_OUTPUT_VARIABLES | SH_ENFORCE_PACKING_RESTRICTIONS | SH_LIMIT_EXPRESSION_COMPLEXITY | SH_LIMIT_CALL_STACK_DEPTH | SH_INITIALIZE_UNINITIALIZED_LOCALS;
-
-    if (m_requiresBuiltInFunctionEmulation)
-        extraCompileOptions |= SH_EMULATE_ABS_INT_FUNCTION;
-
-    Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>> symbols;
-    bool isValid = compiler.compileShaderSource(entry.source.utf8().data(), shaderType, translatedShaderSource, shaderInfoLog, symbols, extraCompileOptions);
-
-    entry.log = shaderInfoLog;
-    entry.isValid = isValid;
-
-    for (const std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>& pair : symbols) {
-        const std::string& name = pair.second.name;
-        entry.symbolMap(pair.first).set(String(name.c_str(), name.length()), pair.second);
-    }
-
-    if (!isValid)
+    Vector<GLchar> name(sourceLength); // GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE includes null termination.
+    int returnedLength = 0;
+    gl::GetTranslatedShaderSourceANGLE(shader, sourceLength, &returnedLength, name.data());
+    if (!returnedLength)
         return emptyString();
-
-    return translatedShaderSource;
+    ASSERT(returnedLength == sourceLength);
+    return String(name.data(), returnedLength);
 }
 
@@ -191 +122 @@
         gl::GetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
         for (GLint i = 0; i < numExtensions; ++i)
-            m_availableExtensions.add(glGetStringi(GL_EXTENSIONS, i));
+            m_availableExtensions.add(gl::GetStringi(GL_EXTENSIONS, i));
+        gl::GetIntegerv(GL_NUM_REQUESTABLE_EXTENSIONS_ANGLE, &numExtensions);
+        for (GLint i = 0; i < numExtensions; ++i)
+            m_requestableExtensions.add(gl::GetStringi(GL_REQUESTABLE_EXTENSIONS_ANGLE, i));
     } else {
         String extensionsString = getExtensions();
         for (auto& extension : extensionsString.split(' '))
             m_availableExtensions.add(extension);
+        extensionsString = String(reinterpret_cast<const char*>(gl::GetString(GL_REQUESTABLE_EXTENSIONS_ANGLE)));
+        for (auto& extension : extensionsString.split(' '))
+            m_requestableExtensions.add(extension);
     }
     m_initializedAvailableExtensions = true;
@@ -218 +155 @@
 {
     // FIXME: consider adding support for APPLE_framebuffer_multisample.
-    gl::BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    gl::BlitFramebufferANGLE(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 void Extensions3DANGLE::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height)
 {
-    gl::RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    gl::RenderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height);
 }
 
@@ -230 +167 @@
     m_context->makeContextCurrent();
     GLuint array = 0;
-    gl::GenVertexArrays(1, &array);
+    gl::GenVertexArraysOES(1, &array);
     return array;
 }
@@ -240 +177 @@
 
     m_context->makeContextCurrent();
-    gl::DeleteVertexArrays(1, &array);
+    gl::DeleteVertexArraysOES(1, &array);
 }
 
@@ -249 +186 @@
 
     m_context->makeContextCurrent();
-    return gl::IsVertexArray(array);
+    return gl::IsVertexArrayOES(array);
 }
 
@@ -255 +192 @@
 {
     m_context->makeContextCurrent();
-    gl::BindVertexArray(array);
+    gl::BindVertexArrayOES(array);
 }
 
@@ -278 +215 @@
 bool Extensions3DANGLE::supportsExtension(const String& name)
 {
-    return m_availableExtensions.contains(name);
+    return m_availableExtensions.contains(name) || m_requestableExtensions.contains(name);
 }
 
 void Extensions3DANGLE::drawBuffersEXT(GC3Dsizei n, const GC3Denum* bufs)
 {
-    gl::DrawBuffers(n, bufs);
+    gl::DrawBuffersEXT(n, bufs);
 }
 
@@ -289 +226 @@
 {
     m_context->makeContextCurrent();
-    gl::DrawArraysInstanced(mode, first, count, primcount);
+    gl::DrawArraysInstancedANGLE(mode, first, count, primcount);
 }
 
@@ -295 +232 @@
 {
     m_context->makeContextCurrent();
-    gl::DrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
+    gl::DrawElementsInstancedANGLE(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
 }
 
@@ -301 +238 @@
 {
     m_context->makeContextCurrent();
-    gl::VertexAttribDivisor(index, divisor);
+    gl::VertexAttribDivisorANGLE(index, divisor);
 }
 

trunk/Source/WebCore/platform/graphics/angle/Extensions3DANGLE.h

@@ -85 +85 @@
     bool m_initializedAvailableExtensions;
     HashSet<String> m_availableExtensions;
+    HashSet<String> m_requestableExtensions;
+    HashSet<String> m_enabledExtensions;
 
     // Weak pointer back to GraphicsContext3D.

trunk/Source/WebCore/platform/graphics/angle/GraphicsContext3DANGLE.cpp

@@ -53 +53 @@
 #endif
 
+// Skip the inclusion of ANGLE's explicit context entry points for now.
+#define GL_ANGLE_explicit_context
+#define GL_ANGLE_explicit_context_gles1
+typedef void* GLeglContext;
 #include <ANGLE/entry_points_gles_2_0_autogen.h>
 #include <ANGLE/entry_points_gles_3_0_autogen.h>
+#include <ANGLE/entry_points_gles_ext_autogen.h>
+#include <ANGLE/gl2ext.h>
+#include <ANGLE/gl2ext_angle.h>
 
 // Note: this file can't be compiled in the same unified source file
@@ -64 +71 @@
 
 namespace WebCore {
+
+static const char* packedDepthStencilExtensionName = "GL_OES_packed_depth_stencil";
 
 void GraphicsContext3D::releaseShaderCompiler()
@@ -116 +125 @@
 void GraphicsContext3D::validateAttributes()
 {
-    validateDepthStencil("GL_EXT_packed_depth_stencil");
+    validateDepthStencil(packedDepthStencilExtensionName);
 }
 
@@ -138 +147 @@
         // Use a 24 bit depth buffer where we know we have it.
         if (extensions.supports("GL_OES_packed_depth_stencil"))
-            internalDepthStencilFormat = GL_DEPTH24_STENCIL8;
+            internalDepthStencilFormat = GL_DEPTH24_STENCIL8_OES;
         else
             internalDepthStencilFormat = GL_DEPTH_COMPONENT16;
@@ -146 +155 @@
     if (m_attrs.antialias) {
         GLint maxSampleCount;
-        gl::GetIntegerv(GL_MAX_SAMPLES_EXT, &maxSampleCount);
+        gl::GetIntegerv(GL_MAX_SAMPLES_ANGLE, &maxSampleCount);
         // Using more than 4 samples is slow on some hardware and is unlikely to
         // produce a significantly better result.
@@ -152 +161 @@
         gl::BindFramebuffer(GL_FRAMEBUFFER, m_multisampleFBO);
         gl::BindRenderbuffer(GL_RENDERBUFFER, m_multisampleColorBuffer);
-        gl::RenderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_RGBA8, width, height);
+        getExtensions().renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, GL_RGBA8, width, height);
         gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, m_multisampleColorBuffer);
         if (m_attrs.stencil || m_attrs.depth) {
             gl::BindRenderbuffer(GL_RENDERBUFFER, m_multisampleDepthStencilBuffer);
-            gl::RenderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, internalDepthStencilFormat, width, height);
-            if (m_attrs.stencil)
-                gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_multisampleDepthStencilBuffer);
-            if (m_attrs.depth)
-                gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_multisampleDepthStencilBuffer);
+            getExtensions().renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, internalDepthStencilFormat, width, height);
+            // WebGL 1.0's rules state that combined depth/stencil renderbuffers
+            // have to be attached to the synthetic DEPTH_STENCIL_ATTACHMENT point.
+            if (!isGLES2Compliant() && internalDepthStencilFormat == GL_DEPTH24_STENCIL8_OES)
+                gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_multisampleDepthStencilBuffer);
+            else {
+                if (m_attrs.stencil)
+                    gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_multisampleDepthStencilBuffer);
+                if (m_attrs.depth)
+                    gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_multisampleDepthStencilBuffer);
+            }
         }
         gl::BindRenderbuffer(GL_RENDERBUFFER, 0);
-        if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
+        if (gl::CheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
             // FIXME: cleanup.
             notImplemented();
@@ -175 +190 @@
 
 #if PLATFORM(MAC)
-    // FIXME: implement back buffer path using ANGLE and pbuffers.
-    // allocateIOSurfaceBackingStore(IntSize(width, height));
-    // updateFramebufferTextureBackingStoreFromLayer();
-    // gl::FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ARB, m_texture, 0);
+    allocateIOSurfaceBackingStore(IntSize(width, height));
+    updateFramebufferTextureBackingStoreFromLayer();
+    gl::FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ANGLE, m_texture, 0);
 #elif PLATFORM(IOS_FAMILY)
     // FIXME (kbr): implement iOS path, ideally using glFramebufferTexture2DMultisample.
@@ -185 +199 @@
     // setRenderbufferStorageFromDrawable(m_currentWidth, m_currentHeight);
 #else
-#error Unknown platform
+#error Unknown Cocoa platform
 #endif
 #else
-    gl::BindTexture(GL_TEXTURE_2D, m_texture);
-    gl::TexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
-    gl::FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0);
-
-#if USE(COORDINATED_GRAPHICS)
-    if (m_compositorTexture) {
-        gl::BindTexture(GL_TEXTURE_2D, m_compositorTexture);
-        gl::TexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
-        gl::BindTexture(GL_TEXTURE_2D, 0);
-        gl::BindTexture(GL_TEXTURE_2D, m_intermediateTexture);
-        gl::TexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
-        gl::BindTexture(GL_TEXTURE_2D, 0);
-    }
-#endif
+
+#error Must port to non-Cocoa platforms
+
 #endif // PLATFORM(COCOA)
 
@@ -224 +227 @@
         gl::BindRenderbuffer(GL_RENDERBUFFER, m_depthStencilBuffer);
         gl::RenderbufferStorage(GL_RENDERBUFFER, internalDepthStencilFormat, width, height);
-        if (m_attrs.stencil)
-            gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
-        if (m_attrs.depth)
-            gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+        // WebGL 1.0's rules state that combined depth/stencil renderbuffers
+        // have to be attached to the synthetic DEPTH_STENCIL_ATTACHMENT point.
+        if (!isGLES2Compliant() && internalDepthStencilFormat == GL_DEPTH24_STENCIL8_OES)
+            gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+        else {
+            if (m_attrs.stencil)
+                gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+            if (m_attrs.depth)
+                gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilBuffer);
+        }
         gl::BindRenderbuffer(GL_RENDERBUFFER, 0);
     }
 
-    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
+    if (gl::CheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
         // FIXME: cleanup
         notImplemented();
@@ -241 +250 @@
     TemporaryANGLESetting scopedScissor(GL_SCISSOR_TEST, GL_FALSE);
     TemporaryANGLESetting scopedDither(GL_DITHER, GL_FALSE);
-    TemporaryANGLESetting scopedDepth(GL_DEPTH_TEST, GL_FALSE);
-    TemporaryANGLESetting scopedStencil(GL_STENCIL_TEST, GL_FALSE);
+
+    GLint boundFrameBuffer;
+    gl::GetIntegerv(GL_FRAMEBUFFER_BINDING, &boundFrameBuffer);
+    gl::BindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, m_multisampleFBO);
+    gl::BindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, m_fbo);
 
     // FIXME: figure out more efficient solution for iOS.
     IntRect resolveRect = rect;
-    if (rect.isEmpty())
+    // When using an ES 2.0 context, the full framebuffer must always be
+    // resolved; partial blits are not allowed.
+    if (!isGLES2Compliant() || rect.isEmpty())
         resolveRect = IntRect(0, 0, m_currentWidth, m_currentHeight);
 
-    gl::BlitFramebuffer(resolveRect.x(), resolveRect.y(), resolveRect.maxX(), resolveRect.maxY(), resolveRect.x(), resolveRect.y(), resolveRect.maxX(), resolveRect.maxY(), GL_COLOR_BUFFER_BIT, GL_LINEAR);
+    gl::BlitFramebufferANGLE(resolveRect.x(), resolveRect.y(), resolveRect.maxX(), resolveRect.maxY(), resolveRect.x(), resolveRect.y(), resolveRect.maxX(), resolveRect.maxY(), GL_COLOR_BUFFER_BIT, GL_NEAREST);
+    gl::BindFramebuffer(GL_FRAMEBUFFER, boundFrameBuffer);
 }
 
@@ -376 +391 @@
 // The contents of GraphicsContext3DOpenGLCommon follow, ported to use ANGLE.
 
-static ThreadSpecific<ShaderNameHash*>& getCurrentNameHashMapForShader()
-{
-    static std::once_flag onceFlag;
-    static ThreadSpecific<ShaderNameHash*>* sharedNameHash;
-    std::call_once(onceFlag, [] {
-        sharedNameHash = new ThreadSpecific<ShaderNameHash*>;
-    });
-
-    return *sharedNameHash;
-}
-
-static void setCurrentNameHashMapForShader(ShaderNameHash* shaderNameHash)
-{
-    *getCurrentNameHashMapForShader() = shaderNameHash;
-}
-
-// Hash function used by the ANGLE translator/compiler to do
-// symbol name mangling. Since this is a static method, before
-// calling compileShader we set currentNameHashMapForShader
-// to point to the map kept by the current instance of GraphicsContext3D.
-
-static uint64_t nameHashForShader(const char* name, size_t length)
-{
-    if (!length)
-        return 0;
-
-    CString nameAsCString = CString(name);
-
-    // Look up name in our local map.
-    ShaderNameHash*& currentNameHashMapForShader = *getCurrentNameHashMapForShader();
-    ShaderNameHash::iterator findResult = currentNameHashMapForShader->find(nameAsCString);
-    if (findResult != currentNameHashMapForShader->end())
-        return findResult->value;
-
-    unsigned hashValue = nameAsCString.hash();
-
-    // Convert the 32-bit hash from CString::hash into a 64-bit result
-    // by shifting then adding the size of our table. Overflow would
-    // only be a problem if we're already hashing to the same value (and
-    // we're hoping that over the lifetime of the context we
-    // don't have that many symbols).
-
-    uint64_t result = hashValue;
-    result = (result << 32) + (currentNameHashMapForShader->size() + 1);
-
-    currentNameHashMapForShader->set(nameAsCString, result);
-    return result;
-}
-
 void GraphicsContext3D::validateDepthStencil(const char* packedDepthStencilExtension)
 {
+    // Note there are no Extensions3D::ensureEnabled calls here. The ANGLE
+    // backend currently assumes at a fairly deep level that
+    // EGL_EXTENSIONS_ENABLED_ANGLE is set to true during context creation: for
+    // the allocation of rectangular textures, etc.
     Extensions3D& extensions = getExtensions();
     if (m_attrs.stencil) {
         if (extensions.supports(packedDepthStencilExtension)) {
-            extensions.ensureEnabled(packedDepthStencilExtension);
             // Force depth if stencil is true.
             m_attrs.depth = true;
         } else
             m_attrs.stencil = false;
+
     }
     if (m_attrs.antialias) {
-        if (!extensions.supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant())
+        // FIXME: must adjust this when upgrading to WebGL 2.0 / OpenGL ES 3.0 support.
+        if (!extensions.supports("GL_ANGLE_framebuffer_multisample") || !extensions.supports("GL_ANGLE_framebuffer_blit") || !extensions.supports("GL_OES_rgb8_rgba8") || isGLES2Compliant())
             m_attrs.antialias = false;
-        else
-            extensions.ensureEnabled("GL_ANGLE_framebuffer_multisample");
     }
 }
@@ -514 +483 @@
     makeContextCurrent();
 
-#if !USE(COORDINATED_GRAPHICS)
-    TemporaryANGLESetting scopedScissor(GL_SCISSOR_TEST, GL_FALSE);
-    TemporaryANGLESetting scopedDither(GL_DITHER, GL_FALSE);
-#endif
-
     if (m_attrs.antialias)
         resolveMultisamplingIfNecessary();
 
-#if USE(COORDINATED_GRAPHICS)
-    std::swap(m_texture, m_compositorTexture);
-    std::swap(m_texture, m_intermediateTexture);
-    gl::BindFramebuffer(GL_FRAMEBUFFER, m_fbo);
-    gl::FramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_texture, 0);
-    glFlush();
-
-    if (m_state.boundFBO != m_fbo)
-        gl::BindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_state.boundFBO);
-    else
-        gl::BindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo);
-    return;
-#endif
-
-    gl::ActiveTexture(GL_TEXTURE0);
-    gl::BindTexture(GL_TEXTURE_2D, m_state.boundTarget(GL_TEXTURE0) == GL_TEXTURE_2D ? m_state.boundTexture(GL_TEXTURE0) : 0);
-    gl::ActiveTexture(m_state.activeTextureUnit);
-    if (m_state.boundFBO != m_fbo)
-        gl::BindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_state.boundFBO);
     gl::Flush();
 }
@@ -652 +597 @@
 }
 
-bool GraphicsContext3D::checkVaryingsPacking(Platform3DObject vertexShader, Platform3DObject fragmentShader) const
-{
-    ASSERT(m_shaderSourceMap.contains(vertexShader));
-    ASSERT(m_shaderSourceMap.contains(fragmentShader));
-    const auto& vertexEntry = m_shaderSourceMap.find(vertexShader)->value;
-    const auto& fragmentEntry = m_shaderSourceMap.find(fragmentShader)->value;
-
-    HashMap<String, sh::ShaderVariable> combinedVaryings;
-    for (const auto& vertexSymbol : vertexEntry.varyingMap) {
-        const String& symbolName = vertexSymbol.key;
-        // The varying map includes variables for each index of an array variable.
-        // We only want a single variable to represent the array.
-        if (symbolName.endsWith("]"))
-            continue;
-
-        // Don't count built in varyings.
-        if (symbolName == "gl_FragCoord" || symbolName == "gl_FrontFacing" || symbolName == "gl_PointCoord")
-            continue;
-
-        const auto& fragmentSymbol = fragmentEntry.varyingMap.find(symbolName);
-        if (fragmentSymbol != fragmentEntry.varyingMap.end())
-            combinedVaryings.add(symbolName, fragmentSymbol->value);
-    }
-
-    size_t numVaryings = combinedVaryings.size();
-    if (!numVaryings)
-        return true;
-
-    std::vector<sh::ShaderVariable> variables;
-    variables.reserve(combinedVaryings.size());
-    for (const auto& varyingSymbol : combinedVaryings.values())
-        variables.push_back(varyingSymbol);
-
-    GC3Dint maxVaryingVectors = 0;
-    gl::GetIntegerv(MAX_VARYING_VECTORS, &maxVaryingVectors);
-    return sh::CheckVariablesWithinPackingLimits(maxVaryingVectors, variables);
-}
-
-bool GraphicsContext3D::precisionsMatch(Platform3DObject vertexShader, Platform3DObject fragmentShader) const
-{
-    ASSERT(m_shaderSourceMap.contains(vertexShader));
-    ASSERT(m_shaderSourceMap.contains(fragmentShader));
-    const auto& vertexEntry = m_shaderSourceMap.find(vertexShader)->value;
-    const auto& fragmentEntry = m_shaderSourceMap.find(fragmentShader)->value;
-
-    HashMap<String, sh::GLenum> vertexSymbolPrecisionMap;
-
-    for (const auto& entry : vertexEntry.uniformMap) {
-        const std::string& mappedName = entry.value.mappedName;
-        vertexSymbolPrecisionMap.add(String(mappedName.c_str(), mappedName.length()), entry.value.precision);
-    }
-
-    for (const auto& entry : fragmentEntry.uniformMap) {
-        const std::string& mappedName = entry.value.mappedName;
-        const auto& vertexSymbol = vertexSymbolPrecisionMap.find(String(mappedName.c_str(), mappedName.length()));
-        if (vertexSymbol != vertexSymbolPrecisionMap.end() && vertexSymbol->value != entry.value.precision)
-            return false;
-    }
-
-    return true;
-}
-
 IntSize GraphicsContext3D::getInternalFramebufferSize() const
 {
@@ -731 +614 @@
     ASSERT(shader);
     makeContextCurrent();
-    m_shaderProgramSymbolCountMap.remove(program);
     gl::AttachShader(program, shader);
 }
@@ -739 +621 @@
     ASSERT(program);
     makeContextCurrent();
-
-    String mappedName = mappedSymbolName(program, SHADER_SYMBOL_TYPE_ATTRIBUTE, name);
-    LOG(WebGL, "::bindAttribLocation is mapping %s to %s", name.utf8().data(), mappedName.utf8().data());
-    gl::BindAttribLocation(program, index, mappedName.utf8().data());
+    gl::BindAttribLocation(program, index, name.utf8().data());
 }
 
@@ -915 +794 @@
     ASSERT(shader);
     makeContextCurrent();
-
-    // Turn on name mapping. Due to the way ANGLE name hashing works, we
-    // point a global hashmap to the map owned by this context.
-    ShBuiltInResources ANGLEResources = m_compiler.getResources();
-    ShHashFunction64 previousHashFunction = ANGLEResources.HashFunction;
-    ANGLEResources.HashFunction = nameHashForShader;
-
-    if (!nameHashMapForShaders)
-        nameHashMapForShaders = std::make_unique<ShaderNameHash>();
-    setCurrentNameHashMapForShader(nameHashMapForShaders.get());
-    m_compiler.setResources(ANGLEResources);
-
-    String translatedShaderSource = m_extensions->getTranslatedShaderSourceANGLE(shader);
-
-    ANGLEResources.HashFunction = previousHashFunction;
-    m_compiler.setResources(ANGLEResources);
-    setCurrentNameHashMapForShader(nullptr);
-
-    if (!translatedShaderSource.length())
-        return;
-
-    const CString& translatedShaderCString = translatedShaderSource.utf8();
-    const char* translatedShaderPtr = translatedShaderCString.data();
-    int translatedShaderLength = translatedShaderCString.length();
-
-    LOG(WebGL, "--- begin original shader source ---\n%s\n--- end original shader source ---\n", getShaderSource(shader).utf8().data());
-    LOG(WebGL, "--- begin translated shader source ---\n%s\n--- end translated shader source ---", translatedShaderPtr);
-
-    gl::ShaderSource(shader, 1, &translatedShaderPtr, &translatedShaderLength);
-
-    ::glCompileShader(shader);
-
-    int compileStatus;
-
-    gl::GetShaderiv(shader, COMPILE_STATUS, &compileStatus);
-
-    ShaderSourceMap::iterator result = m_shaderSourceMap.find(shader);
-    GraphicsContext3D::ShaderSourceEntry& entry = result->value;
-
-    // Populate the shader log
-    GLint length = 0;
-    gl::GetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
-
-    if (length) {
-        GLsizei size = 0;
-        Vector<GLchar> info(length);
-        gl::GetShaderInfoLog(shader, length, &size, info.data());
-
-        Platform3DObject shaders[2] = { shader, 0 };
-        entry.log = getUnmangledInfoLog(shaders, 1, String(info.data(), size));
-    }
-
-    if (compileStatus != GL_TRUE) {
-        entry.isValid = false;
-        LOG(WebGL, "Error: shader translator produced a shader that OpenGL would not compile.");
-    }
+    gl::CompileShader(shader);
 }
 
 void GraphicsContext3D::compileShaderDirect(Platform3DObject shader)
 {
-    ASSERT(shader);
-    makeContextCurrent();
-
-    HashMap<Platform3DObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
-
-    if (result == m_shaderSourceMap.end())
-        return;
-
-    ShaderSourceEntry& entry = result->value;
-
-    const CString& shaderSourceCString = entry.source.utf8();
-    const char* shaderSourcePtr = shaderSourceCString.data();
-    int shaderSourceLength = shaderSourceCString.length();
-
-    LOG(WebGL, "--- begin direct shader source ---\n%s\n--- end direct shader source ---\n", shaderSourcePtr);
-
-    gl::ShaderSource(shader, 1, &shaderSourcePtr, &shaderSourceLength);
-
-    gl::CompileShader(shader);
-
-    int compileStatus;
-
-    gl::GetShaderiv(shader, COMPILE_STATUS, &compileStatus);
-
-    if (compileStatus == GL_TRUE) {
-        entry.isValid = true;
-        LOG(WebGL, "Direct compilation of shader succeeded.");
-    } else {
-        entry.isValid = false;
-        LOG(WebGL, "Error: direct compilation of shader failed.");
-    }
+    compileShader(shader);
 }
 
@@ -1055 +849 @@
     ASSERT(shader);
     makeContextCurrent();
-    m_shaderProgramSymbolCountMap.remove(program);
     gl::DetachShader(program, shader);
 }
@@ -1151 +944 @@
         return false;
 
-    String originalName = originalSymbolName(program, SHADER_SYMBOL_TYPE_ATTRIBUTE, String(name.data(), nameLength));
-
-#ifndef NDEBUG
-    String uniformName(name.data(), nameLength);
-    LOG(WebGL, "Program %d is mapping active attribute %d from '%s' to '%s'", program, index, uniformName.utf8().data(), originalName.utf8().data());
-#endif
-
-    info.name = originalName;
+    info.name = String(name.data(), nameLength);
     info.type = type;
     info.size = size;
@@ -1166 +952 @@
 bool GraphicsContext3D::getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo& info)
 {
-    GC3Dint symbolCount;
-    auto result = m_shaderProgramSymbolCountMap.find(program);
-    if (result == m_shaderProgramSymbolCountMap.end()) {
-        getNonBuiltInActiveSymbolCount(program, GraphicsContext3D::ACTIVE_ATTRIBUTES, &symbolCount);
-        result = m_shaderProgramSymbolCountMap.find(program);
-    }
-
-    ActiveShaderSymbolCounts& symbolCounts = result->value;
-    GC3Duint rawIndex = (index < symbolCounts.filteredToActualAttributeIndexMap.size()) ? symbolCounts.filteredToActualAttributeIndexMap[index] : -1;
-
-    return getActiveAttribImpl(program, rawIndex, info);
+    return getActiveAttribImpl(program, index, info);
 }
 
@@ -1198 +974 @@
         return false;
 
-    String originalName = originalSymbolName(program, SHADER_SYMBOL_TYPE_UNIFORM, String(name.data(), nameLength));
-
-#ifndef NDEBUG
-    String uniformName(name.data(), nameLength);
-    LOG(WebGL, "Program %d is mapping active uniform %d from '%s' to '%s'", program, index, uniformName.utf8().data(), originalName.utf8().data());
-#endif
-
-    info.name = originalName;
+    info.name = String(name.data(), nameLength);
     info.type = type;
     info.size = size;
@@ -1213 +982 @@
 bool GraphicsContext3D::getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo& info)
 {
-    GC3Dint symbolCount;
-    auto result = m_shaderProgramSymbolCountMap.find(program);
-    if (result == m_shaderProgramSymbolCountMap.end()) {
-        getNonBuiltInActiveSymbolCount(program, GraphicsContext3D::ACTIVE_UNIFORMS, &symbolCount);
-        result = m_shaderProgramSymbolCountMap.find(program);
-    }
-    
-    ActiveShaderSymbolCounts& symbolCounts = result->value;
-    GC3Duint rawIndex = (index < symbolCounts.filteredToActualUniformIndexMap.size()) ? symbolCounts.filteredToActualUniformIndexMap[index] : -1;
-    
-    return getActiveUniformImpl(program, rawIndex, info);
+    return getActiveUniformImpl(program, index, info);
 }
 
@@ -1236 +995 @@
 }
 
-static String generateHashedName(const String& name)
-{
-    if (name.isEmpty())
-        return name;
-    uint64_t number = nameHashForShader(name.utf8().data(), name.length());
-    StringBuilder builder;
-    builder.appendLiteral("webgl_");
-    appendUnsignedAsHex(number, builder, Lowercase);
-    return builder.toString();
-}
-
-Optional<String> GraphicsContext3D::mappedSymbolInShaderSourceMap(Platform3DObject shader, ANGLEShaderSymbolType symbolType, const String& name)
-{
-    auto result = m_shaderSourceMap.find(shader);
-    if (result == m_shaderSourceMap.end())
-        return WTF::nullopt;
-
-    const auto& symbolMap = result->value.symbolMap(symbolType);
-    auto symbolEntry = symbolMap.find(name);
-    if (symbolEntry == symbolMap.end())
-        return WTF::nullopt;
-
-    auto& mappedName = symbolEntry->value.mappedName;
-    return String(mappedName.c_str(), mappedName.length());
-}
-
-String GraphicsContext3D::mappedSymbolName(Platform3DObject program, ANGLEShaderSymbolType symbolType, const String& name)
-{
-    GC3Dsizei count = 0;
-    Platform3DObject shaders[2] = { };
-    getAttachedShaders(program, 2, &count, shaders);
-
-    for (GC3Dsizei i = 0; i < count; ++i) {
-        auto mappedName = mappedSymbolInShaderSourceMap(shaders[i], symbolType, name);
-        if (mappedName)
-            return mappedName.value();
-    }
-
-    // We might have detached or deleted the shaders after linking.
-    auto result = m_linkedShaderMap.find(program);
-    if (result != m_linkedShaderMap.end()) {
-        auto linkedShaders = result->value;
-        auto mappedName = mappedSymbolInShaderSourceMap(linkedShaders.first, symbolType, name);
-        if (mappedName)
-            return mappedName.value();
-        mappedName = mappedSymbolInShaderSourceMap(linkedShaders.second, symbolType, name);
-        if (mappedName)
-            return mappedName.value();
-    }
-
-    if (symbolType == SHADER_SYMBOL_TYPE_ATTRIBUTE && !name.isEmpty()) {
-        // Attributes are a special case: they may be requested before any shaders have been compiled,
-        // and aren't even required to be used in any shader program.
-        if (!nameHashMapForShaders)
-            nameHashMapForShaders = std::make_unique<ShaderNameHash>();
-        setCurrentNameHashMapForShader(nameHashMapForShaders.get());
-
-        auto generatedName = generateHashedName(name);
-
-        setCurrentNameHashMapForShader(nullptr);
-
-        m_possiblyUnusedAttributeMap.set(generatedName, name);
-
-        return generatedName;
-    }
-
-    return name;
-}
-
-Optional<String> GraphicsContext3D::originalSymbolInShaderSourceMap(Platform3DObject shader, ANGLEShaderSymbolType symbolType, const String& name)
-{
-    auto result = m_shaderSourceMap.find(shader);
-    if (result == m_shaderSourceMap.end())
-        return WTF::nullopt;
-
-    const auto& symbolMap = result->value.symbolMap(symbolType);
-    for (const auto& symbolEntry : symbolMap) {
-        if (name == symbolEntry.value.mappedName.c_str())
-            return symbolEntry.key;
-    }
-    return WTF::nullopt;
-}
-
-String GraphicsContext3D::originalSymbolName(Platform3DObject program, ANGLEShaderSymbolType symbolType, const String& name)
-{
-    GC3Dsizei count;
-    Platform3DObject shaders[2];
-    getAttachedShaders(program, 2, &count, shaders);
-    
-    for (GC3Dsizei i = 0; i < count; ++i) {
-        auto originalName = originalSymbolInShaderSourceMap(shaders[i], symbolType, name);
-        if (originalName)
-            return originalName.value();
-    }
-
-    // We might have detached or deleted the shaders after linking.
-    auto result = m_linkedShaderMap.find(program);
-    if (result != m_linkedShaderMap.end()) {
-        auto linkedShaders = result->value;
-        auto originalName = originalSymbolInShaderSourceMap(linkedShaders.first, symbolType, name);
-        if (originalName)
-            return originalName.value();
-        originalName = originalSymbolInShaderSourceMap(linkedShaders.second, symbolType, name);
-        if (originalName)
-            return originalName.value();
-    }
-
-    if (symbolType == SHADER_SYMBOL_TYPE_ATTRIBUTE && !name.isEmpty()) {
-        // Attributes are a special case: they may be requested before any shaders have been compiled,
-        // and aren't even required to be used in any shader program.
-
-        const auto& cached = m_possiblyUnusedAttributeMap.find(name);
-        if (cached != m_possiblyUnusedAttributeMap.end())
-            return cached->value;
-    }
-
-    return name;
-}
-
-String GraphicsContext3D::mappedSymbolName(Platform3DObject shaders[2], size_t count, const String& name)
-{
-    for (size_t symbolType = 0; symbolType <= static_cast<size_t>(SHADER_SYMBOL_TYPE_VARYING); ++symbolType) {
-        for (size_t i = 0; i < count; ++i) {
-            ShaderSourceMap::iterator result = m_shaderSourceMap.find(shaders[i]);
-            if (result == m_shaderSourceMap.end())
-                continue;
-            
-            const ShaderSymbolMap& symbolMap = result->value.symbolMap(static_cast<enum ANGLEShaderSymbolType>(symbolType));
-            for (const auto& symbolEntry : symbolMap) {
-                if (name == symbolEntry.value.mappedName.c_str())
-                    return symbolEntry.key;
-            }
-        }
-    }
-    return name;
-}
-
 int GraphicsContext3D::getAttribLocation(Platform3DObject program, const String& name)
 {
@@ -1380 +1002 @@
     makeContextCurrent();
 
-    String mappedName = mappedSymbolName(program, SHADER_SYMBOL_TYPE_ATTRIBUTE, name);
-    LOG(WebGL, "gl::GetAttribLocation is mapping %s to %s", name.utf8().data(), mappedName.utf8().data());
-    return gl::GetAttribLocation(program, mappedName.utf8().data());
+    return gl::GetAttribLocation(program, name.utf8().data());
 }
 
 int GraphicsContext3D::getAttribLocationDirect(Platform3DObject program, const String& name)
 {
-    if (!program)
-        return -1;
-
-    makeContextCurrent();
-
-    return gl::GetAttribLocation(program, name.utf8().data());
+    return getAttribLocation(program, name);
 }
 
@@ -1409 +1024 @@
     // Otherwise, we would just loop until we got NO_ERROR.
     for (unsigned i = 0; i < 100; ++i) {
-        GC3Denum error = glGetError();
+        GC3Denum error = gl::GetError();
         if (error == NO_ERROR)
             break;
@@ -1515 +1130 @@
     ASSERT(program);
     makeContextCurrent();
-
-    GC3Dsizei count = 0;
-    Platform3DObject shaders[2] = { };
-    getAttachedShaders(program, 2, &count, shaders);
-
-    if (count == 2)
-        m_linkedShaderMap.set(program, std::make_pair(shaders[0], shaders[1]));
-
     gl::LinkProgram(program);
 }
@@ -1556 +1163 @@
     makeContextCurrent();
 
-    ShaderSourceEntry entry;
-
-    entry.source = string;
-
-    m_shaderSourceMap.set(shader, entry);
+    const CString& shaderSourceCString = string.utf8();
+    const char* shaderSourcePtr = shaderSourceCString.data();
+    int shaderSourceLength = shaderSourceCString.length();
+    gl::ShaderSource(shader, 1, &shaderSourcePtr, &shaderSourceLength);
 }
 
@@ -1879 +1485 @@
 }
 
-void GraphicsContext3D::getNonBuiltInActiveSymbolCount(Platform3DObject program, GC3Denum pname, GC3Dint* value)
-{
-    ASSERT(ACTIVE_ATTRIBUTES == pname || ACTIVE_UNIFORMS == pname);
-    if (!value)
-        return;
-
-    makeContextCurrent();
-    const auto& result = m_shaderProgramSymbolCountMap.find(program);
-    if (result != m_shaderProgramSymbolCountMap.end()) {
-        *value = result->value.countForType(pname);
-        return;
-    }
-
-    m_shaderProgramSymbolCountMap.set(program, ActiveShaderSymbolCounts());
-    ActiveShaderSymbolCounts& symbolCounts = m_shaderProgramSymbolCountMap.find(program)->value;
-
-    // Retrieve the active attributes, build a filtered count, and a mapping of
-    // our internal attributes indexes to the real unfiltered indexes inside OpenGL.
-    GC3Dint attributeCount = 0;
-    gl::GetProgramiv(program, ACTIVE_ATTRIBUTES, &attributeCount);
-    for (GC3Dint i = 0; i < attributeCount; ++i) {
-        ActiveInfo info;
-        getActiveAttribImpl(program, i, info);
-        if (info.name.startsWith("gl_"))
-            continue;
-
-        symbolCounts.filteredToActualAttributeIndexMap.append(i);
-    }
-    
-    // Do the same for uniforms.
-    GC3Dint uniformCount = 0;
-    gl::GetProgramiv(program, ACTIVE_UNIFORMS, &uniformCount);
-    for (GC3Dint i = 0; i < uniformCount; ++i) {
-        ActiveInfo info;
-        getActiveUniformImpl(program, i, info);
-        if (info.name.startsWith("gl_"))
-            continue;
-        
-        symbolCounts.filteredToActualUniformIndexMap.append(i);
-    }
-    
-    *value = symbolCounts.countForType(pname);
-}
-
 String GraphicsContext3D::getUnmangledInfoLog(Platform3DObject shaders[2], GC3Dsizei count, const String& log)
 {
+    UNUSED_PARAM(shaders);
+    UNUSED_PARAM(count);
     LOG(WebGL, "Original ShaderInfoLog:\n%s", log.utf8().data());
 
-    JSC::Yarr::RegularExpression regExp("webgl_[0123456789abcdefABCDEF]+");
-
     StringBuilder processedLog;
-    
+
     // ANGLE inserts a "#extension" line into the shader source that
     // causes a warning in some compilers. There is no point showing
@@ -1937 +1499 @@
     static const NeverDestroyed<String> angleWarning { "WARNING: 0:1: extension 'GL_ARB_gpu_shader5' is not supported\n"_s };
     int startFrom = log.startsWith(angleWarning) ? angleWarning.get().length() : 0;
-    int matchedLength = 0;
-
-    do {
-        int start = regExp.match(log, startFrom, &matchedLength);
-        if (start == -1)
-            break;
-
-        processedLog.append(log.substring(startFrom, start - startFrom));
-        startFrom = start + matchedLength;
-
-        const String& mangledSymbol = log.substring(start, matchedLength);
-        const String& mappedSymbol = mappedSymbolName(shaders, count, mangledSymbol);
-        LOG(WebGL, "Demangling: %s to %s", mangledSymbol.utf8().data(), mappedSymbol.utf8().data());
-        processedLog.append(mappedSymbol);
-    } while (startFrom < static_cast<int>(log.length()));
-
     processedLog.append(log.substring(startFrom, log.length() - startFrom));
 
@@ -1991 +1537 @@
 
     makeContextCurrent();
-
-    const auto& result = m_shaderSourceMap.find(shader);
-    
-    switch (pname) {
-    case DELETE_STATUS:
-    case SHADER_TYPE:
-        gl::GetShaderiv(shader, pname, value);
-        break;
-    case COMPILE_STATUS:
-        if (result == m_shaderSourceMap.end()) {
-            *value = static_cast<int>(false);
-            return;
-        }
-        *value = static_cast<int>(result->value.isValid);
-        break;
-    case INFO_LOG_LENGTH:
-        if (result == m_shaderSourceMap.end()) {
-            *value = 0;
-            return;
-        }
-        *value = getShaderInfoLog(shader).length();
-        break;
-    case SHADER_SOURCE_LENGTH:
-        *value = getShaderSource(shader).length();
-        break;
-    default:
-        synthesizeGLError(INVALID_ENUM);
-    }
+    gl::GetShaderiv(shader, pname, value);
 }
 
@@ -2026 +1545 @@
 
     makeContextCurrent();
-
-    const auto& result = m_shaderSourceMap.find(shader);
-    if (result == m_shaderSourceMap.end())
-        return String(); 
-
-    const ShaderSourceEntry& entry = result->value;
-    if (!entry.isValid)
-        return entry.log;
-
     GLint length = 0;
     gl::GetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
@@ -2048 +1558 @@
 }
 
-String GraphicsContext3D::getShaderSource(Platform3DObject shader)
-{
-    ASSERT(shader);
-
-    makeContextCurrent();
-
-    const auto& result = m_shaderSourceMap.find(shader);
-    if (result == m_shaderSourceMap.end())
-        return String(); 
-
-    return result->value.source;
-}
-
-
 void GraphicsContext3D::getTexParameterfv(GC3Denum target, GC3Denum pname, GC3Dfloat* value)
 {
@@ -2091 +1587 @@
 
     makeContextCurrent();
-
-    String mappedName = mappedSymbolName(program, SHADER_SYMBOL_TYPE_UNIFORM, name);
-    LOG(WebGL, "::getUniformLocation is mapping %s to %s", name.utf8().data(), mappedName.utf8().data());
-    return gl::GetUniformLocation(program, mappedName.utf8().data());
+    return gl::GetUniformLocation(program, name.utf8().data());
 }
 
@@ -2145 +1638 @@
     makeContextCurrent();
     GLuint o = 0;
-    glGenBuffers(1, &o);
+    gl::GenBuffers(1, &o);
     return o;
 }
@@ -2153 +1646 @@
     makeContextCurrent();
     GLuint o = 0;
-    glGenFramebuffers(1, &o);
+    gl::GenFramebuffers(1, &o);
     return o;
 }
@@ -2160 +1653 @@
 {
     makeContextCurrent();
-    return glCreateProgram();
+    return gl::CreateProgram();
 }
 
@@ -2167 +1660 @@
     makeContextCurrent();
     GLuint o = 0;
-    glGenRenderbuffers(1, &o);
+    gl::GenRenderbuffers(1, &o);
     return o;
 }
@@ -2174 +1667 @@
 {
     makeContextCurrent();
-    return glCreateShader((type == FRAGMENT_SHADER) ? GL_FRAGMENT_SHADER : GL_VERTEX_SHADER);
+    return gl::CreateShader((type == FRAGMENT_SHADER) ? GL_FRAGMENT_SHADER : GL_VERTEX_SHADER);
 }
 
@@ -2181 +1674 @@
     makeContextCurrent();
     GLuint o = 0;
-    glGenTextures(1, &o);
+    gl::GenTextures(1, &o);
     m_state.textureSeedCount.add(o);
     return o;
@@ -2189 +1682 @@
 {
     makeContextCurrent();
-    glDeleteBuffers(1, &buffer);
+    gl::DeleteBuffers(1, &buffer);
 }
 
@@ -2200 +1693 @@
         bindFramebuffer(FRAMEBUFFER, 0);
     }
-    glDeleteFramebuffers(1, &framebuffer);
+    gl::DeleteFramebuffers(1, &framebuffer);
 }
 
@@ -2206 +1699 @@
 {
     makeContextCurrent();
-    m_shaderProgramSymbolCountMap.remove(program);
-    glDeleteProgram(program);
+    gl::DeleteProgram(program);
 }
 
@@ -2213 +1705 @@
 {
     makeContextCurrent();
-    glDeleteRenderbuffers(1, &renderbuffer);
+    gl::DeleteRenderbuffers(1, &renderbuffer);
 }
 
@@ -2219 +1711 @@
 {
     makeContextCurrent();
-    glDeleteShader(shader);
+    gl::DeleteShader(shader);
 }
 
@@ -2228 +1720 @@
         return keyValue.value.first == texture;
     });
-    glDeleteTextures(1, &texture);
+    gl::DeleteTextures(1, &texture);
     m_state.textureSeedCount.removeAll(texture);
 }
@@ -2236 +1728 @@
     // Need to move the current errors to the synthetic error list to
     // preserve the order of errors, so a caller to getError will get
-    // any errors from glError before the error we are synthesizing.
+    // any errors from gl::Error before the error we are synthesizing.
     moveErrorsToSyntheticErrorList();
     m_syntheticErrors.add(error);

trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm

@@ -61 +61 @@
 #import <OpenGL/gl.h>
 #elif USE(ANGLE)
+#define EGL_EGL_PROTOTYPES 0
+// Skip the inclusion of ANGLE's explicit context entry points for now.
+#define GL_ANGLE_explicit_context
+#define GL_ANGLE_explicit_context_gles1
+typedef void* GLeglContext;
+#include <ANGLE/egl.h>
+#include <ANGLE/eglext.h>
+#include <ANGLE/eglext_angle.h>
+#include <ANGLE/entry_points_egl.h>
 #include <ANGLE/entry_points_gles_2_0_autogen.h>
+#include <ANGLE/entry_points_gles_ext_autogen.h>
+#include <ANGLE/gl2ext.h>
+#include <ANGLE/gl2ext_angle.h>
 #endif
 
@@ -255 +267 @@
 {
 #if USE(ANGLE)
-    if (m_attrs.isWebGL2)
-        m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT, SH_WEBGL2_SPEC);
-    else
-        m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT);
+    // In the ANGLE backend, the only shader compiler instantiated is
+    // the one ANGLE uses internally.
 #else
 #if PLATFORM(IOS_FAMILY)
@@ -369 +379 @@
 
 #elif USE(ANGLE)
-
-    // FIXME: implement context setup via ANGLE.
     UNUSED_PARAM(hostWindow);
     UNUSED_PARAM(sharedContext);
 
-#endif
-    
+    m_displayObj = EGL_GetDisplay(EGL_DEFAULT_DISPLAY);
+    if (m_displayObj == EGL_NO_DISPLAY)
+        return;
+    EGLint majorVersion, minorVersion;
+    if (EGL_Initialize(m_displayObj, &majorVersion, &minorVersion) == EGL_FALSE) {
+        LOG(WebGL, "EGLDisplay Initialization failed.");
+        return;
+    }
+    LOG(WebGL, "ANGLE initialised Major: %d Minor: %d", majorVersion, minorVersion);
+    const char *displayExtensions = EGL_QueryString(m_displayObj, EGL_EXTENSIONS);
+    LOG(WebGL, "Extensions: %s", displayExtensions);
+
+    EGLConfig config;
+    EGLint configAttributes[] = {
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
+        EGL_ALPHA_SIZE, 8,
+        EGL_NONE
+    };
+    EGLint numberConfigsReturned = 0;
+    EGL_ChooseConfig(m_displayObj, configAttributes, &config, 1, &numberConfigsReturned);
+    if (numberConfigsReturned != 1) {
+        LOG(WebGL, "EGLConfig Initialization failed.");
+        return;
+    }
+    LOG(WebGL, "Got EGLConfig");
+
+    EGL_BindAPI(EGL_OPENGL_ES_API);
+    if (EGL_GetError() != EGL_SUCCESS) {
+        LOG(WebGL, "Unable to bind to OPENGL_ES_API");
+        return;
+    }
+
+    std::vector<EGLint> contextAttributes;
+    contextAttributes.push_back(EGL_CONTEXT_CLIENT_VERSION);
+    contextAttributes.push_back(2);
+    contextAttributes.push_back(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE);
+    contextAttributes.push_back(EGL_TRUE);
+    contextAttributes.push_back(EGL_EXTENSIONS_ENABLED_ANGLE);
+    contextAttributes.push_back(EGL_TRUE);
+    if (strstr(displayExtensions, "EGL_ANGLE_power_preference")) {
+        contextAttributes.push_back(EGL_POWER_PREFERENCE_ANGLE);
+        // EGL_LOW_POWER_ANGLE is the default. Change to
+        // EGL_HIGH_POWER_ANGLE if desired.
+        contextAttributes.push_back(EGL_LOW_POWER_ANGLE);
+    }
+    contextAttributes.push_back(EGL_NONE);
+
+    m_contextObj = EGL_CreateContext(m_displayObj, config, EGL_NO_CONTEXT, contextAttributes.data());
+    if (m_contextObj == EGL_NO_CONTEXT) {
+        LOG(WebGL, "EGLContext Initialization failed.");
+        return;
+    }
+    LOG(WebGL, "Got EGLContext");
+
+    EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, m_contextObj);
+
+#endif // #elif USE(ANGLE)
+
     validateAttributes();
 
@@ -383 +450 @@
 #ifndef NDEBUG
         [m_webGLLayer setName:@"WebGL Layer"];
+#endif
+#if USE(ANGLE)
+        [m_webGLLayer setEGLDisplay:m_displayObj andConfig:config];
 #endif
     END_BLOCK_OBJC_EXCEPTIONS
@@ -405 +475 @@
     ::glBindTexture(GL_TEXTURE_RECTANGLE_EXT, 0);
 #elif USE(ANGLE)
-    // FIXME: implement back buffer setup via ANGLE.
+    gl::GenTextures(1, &m_texture);
+    gl::BindTexture(GL_TEXTURE_RECTANGLE_ANGLE, m_texture);
+    gl::TexParameteri(GL_TEXTURE_RECTANGLE_ANGLE, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    gl::TexParameteri(GL_TEXTURE_RECTANGLE_ANGLE, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    gl::TexParameteri(GL_TEXTURE_RECTANGLE_ANGLE, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gl::TexParameteri(GL_TEXTURE_RECTANGLE_ANGLE, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    gl::BindTexture(GL_TEXTURE_RECTANGLE_ANGLE, 0);
 #else
 #error Unsupported configuration
@@ -428 +504 @@
             ::glGenRenderbuffersEXT(1, &m_multisampleDepthStencilBuffer);
     }
-#endif // USE(ANGLE) || USE(OPENGL_ES)
-
-    // ANGLE initialization.
+#elif USE(ANGLE)
+    gl::GenFramebuffers(1, &m_fbo);
+    gl::BindFramebuffer(GL_FRAMEBUFFER, m_fbo);
+    m_state.boundFBO = m_fbo;
+
+    if (!m_attrs.antialias && (m_attrs.stencil || m_attrs.depth))
+        gl::GenRenderbuffers(1, &m_depthStencilBuffer);
+
+    // If necessary, create another framebuffer for the multisample results.
+    if (m_attrs.antialias) {
+        gl::GenFramebuffers(1, &m_multisampleFBO);
+        gl::BindFramebuffer(GL_FRAMEBUFFER, m_multisampleFBO);
+        m_state.boundFBO = m_multisampleFBO;
+        gl::GenRenderbuffers(1, &m_multisampleColorBuffer);
+        if (m_attrs.stencil || m_attrs.depth)
+            gl::GenRenderbuffers(1, &m_multisampleDepthStencilBuffer);
+    }
+
+#endif // USE(ANGLE)
+
+#if !USE(ANGLE)
+    // ANGLE shader compiler initialization.
 
     ShBuiltInResources ANGLEResources;
@@ -451 +546 @@
 
     m_compiler.setResources(ANGLEResources);
+#endif // !USE(ANGLE)
     
 #if USE(OPENGL)
@@ -460 +556 @@
 #if USE(OPENGL) || USE(OPENGL_ES)
     ::glClearColor(0, 0, 0, 0);
+#elif USE(ANGLE)
+    gl::ClearColor(0, 0, 0, 0);
 #endif
 
@@ -478 +576 @@
         ::glDeleteTextures(1, &m_texture);
 #elif USE(ANGLE)
-        // FIXME: make context current via ANGLE.
+        EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, m_contextObj);
+        gl::DeleteTextures(1, &m_texture);
 #endif
 
@@ -492 +591 @@
         }
         ::glDeleteFramebuffersEXT(1, &m_fbo);
+#elif USE(ANGLE)
+        if (m_attrs.antialias) {
+            gl::DeleteRenderbuffers(1, &m_multisampleColorBuffer);
+            if (m_attrs.stencil || m_attrs.depth)
+                gl::DeleteRenderbuffers(1, &m_multisampleDepthStencilBuffer);
+            gl::DeleteFramebuffers(1, &m_multisampleFBO);
+        } else {
+            if (m_attrs.stencil || m_attrs.depth)
+                gl::DeleteRenderbuffers(1, &m_depthStencilBuffer);
+        }
+        gl::DeleteFramebuffers(1, &m_fbo);
 #endif
 
@@ -501 +611 @@
         CGLDestroyContext(m_contextObj);
 #elif USE(ANGLE)
-        // FIXME: implement context teardown via ANGLE.
+        EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        EGL_DestroyContext(m_displayObj, m_contextObj);
 #endif
         [m_webGLLayer setContext:nullptr];
@@ -538 +649 @@
         return CGLSetCurrentContext(m_contextObj) == kCGLNoError;
 #elif USE(ANGLE)
-    // FIXME: implement making context current via ANGLE.
+    if (EGL_GetCurrentContext() != m_contextObj)
+        return EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, m_contextObj);
 #endif
     return true;
@@ -554 +666 @@
         [EAGLContext setCurrentContext:0];
 #elif USE(ANGLE)
-        // FIXME: implement forced context loss via ANGLE.
+        EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 #endif
         return;
@@ -658 +770 @@
     }
 }
-#endif
+#endif // USE(OPENGL)
+
+#if USE(ANGLE)
+void GraphicsContext3D::allocateIOSurfaceBackingStore(IntSize size)
+{
+    LOG(WebGL, "GraphicsContext3D::allocateIOSurfaceBackingStore at %d x %d. (%p)", size.width(), size.height(), this);
+    [m_webGLLayer allocateIOSurfaceBackingStoreWithSize:size usingAlpha:m_attrs.alpha];
+}
+
+void GraphicsContext3D::updateFramebufferTextureBackingStoreFromLayer()
+{
+    LOG(WebGL, "GraphicsContext3D::updateFramebufferTextureBackingStoreFromLayer(). (%p)", this);
+    [m_webGLLayer bindFramebufferToNextAvailableSurface];
+}
+#endif // USE(ANGLE)
 
 bool GraphicsContext3D::isGLES2Compliant() const

trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.h

@@ -51 +51 @@
     WebCore::GraphicsContext3D* _context;
     float _devicePixelRatio;
-#if USE(OPENGL)
+#if USE(OPENGL) || (USE(ANGLE) && PLATFORM(MAC))
     std::unique_ptr<WebCore::IOSurface> _contentsBuffer;
     std::unique_ptr<WebCore::IOSurface> _drawingBuffer;
@@ -57 +57 @@
     WebCore::IntSize _bufferSize;
     BOOL _usingAlpha;
+#endif
+#if USE(ANGLE) && PLATFORM(MAC)
+    void* _eglDisplay;
+    void* _eglConfig;
+    void* _contentsPbuffer;
+    void* _drawingPbuffer;
+    void* _sparePbuffer;
+    void* _latchedPbuffer;
 #endif
 }
@@ -66 +74 @@
 - (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace;
 
-#if USE(OPENGL)
+#if USE(OPENGL) || (USE(ANGLE) && PLATFORM(MAC))
 - (void)allocateIOSurfaceBackingStoreWithSize:(WebCore::IntSize)size usingAlpha:(BOOL)usingAlpha;
 - (void)bindFramebufferToNextAvailableSurface;
+#endif
+
+#if (USE(ANGLE) && PLATFORM(MAC))
+- (void)setEGLDisplay:(void*)eglDisplay andConfig:(void*)eglConfig;
+- (void)dealloc;
 #endif
 

trunk/Source/WebCore/platform/graphics/cocoa/WebGLLayer.mm

@@ -44 +44 @@
 #endif
 
+#if USE(ANGLE)
+#define EGL_EGL_PROTOTYPES 0
+#include <ANGLE/egl.h>
+#include <ANGLE/eglext.h>
+#include <ANGLE/eglext_angle.h>
+#include <ANGLE/entry_points_egl.h>
+#include <ANGLE/entry_points_gles_2_0_autogen.h>
+// Skip the inclusion of ANGLE's explicit context entry points for now.
+#define GL_ANGLE_explicit_context
+#include <ANGLE/gl2ext.h>
+#include <ANGLE/gl2ext_angle.h>
+#endif
+
 @implementation WebGLLayer
 
@@ -53 +66 @@
     self = [super init];
     _devicePixelRatio = context->getContextAttributes().devicePixelRatio;
-#if USE(OPENGL)
+#if USE(OPENGL) || USE(ANGLE) && PLATFORM(MAC)
     self.contentsOpaque = !context->getContextAttributes().alpha;
     self.transform = CATransform3DIdentity;
@@ -63 +76 @@
 }
 
-#if USE(OPENGL)
+#if USE(OPENGL) || (USE(ANGLE) && PLATFORM(MAC))
 // When using an IOSurface as layer contents, we need to flip the
 // layer to take into account that the IOSurface provides content
@@ -79 +92 @@
     [super setAnchorPoint:CGPointMake(p.x, 1.0 - p.y)];
 }
-
+#endif // USE(OPENGL) || (USE(ANGLE) && PLATFORM(MAC))
+
+#if USE(OPENGL)
 static void freeData(void *, const void *data, size_t /* size */)
 {
     fastFree(const_cast<void *>(data));
 }
-#endif
+#endif // USE(OPENGL)
 
 - (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
@@ -119 +134 @@
     return image;
 #else
+    // FIXME: implement.
     UNUSED_PARAM(colorSpace);
     return nullptr;
@@ -140 +156 @@
     _context->presentRenderbuffer();
 #elif USE(ANGLE)
-    // FIXME: display rendering results via ANGLE.
+    _context->prepareTexture();
+    if (_drawingBuffer) {
+        if (_latchedPbuffer) {
+            GC3Denum texture = _context->platformTexture();
+            gl::BindTexture(GL_TEXTURE_RECTANGLE_ANGLE, texture);
+            if (!EGL_ReleaseTexImage(_eglDisplay, _latchedPbuffer, EGL_BACK_BUFFER)) {
+                // FIXME: report error.
+                notImplemented();
+            }
+            _latchedPbuffer = nullptr;
+        }
+        std::swap(_contentsBuffer, _drawingBuffer);
+        std::swap(_contentsPbuffer, _drawingPbuffer);
+        self.contents = _contentsBuffer->asLayerContents();
+        [self reloadValueForKeyPath:@"contents"];
+        [self bindFramebufferToNextAvailableSurface];
+    }
 #endif
 
@@ -149 +181 @@
 }
 
-#if USE(OPENGL)
+#if (USE(ANGLE) && PLATFORM(MAC))
+- (void)setEGLDisplay:(void*)display andConfig:(void*)config
+{
+    _eglDisplay = display;
+    _eglConfig = config;
+}
+
+- (void)dealloc
+{
+    EGL_DestroySurface(_eglDisplay, _contentsPbuffer);
+    EGL_DestroySurface(_eglDisplay, _drawingPbuffer);
+    EGL_DestroySurface(_eglDisplay, _sparePbuffer);
+    [super dealloc];
+}
+#endif
+
+#if USE(OPENGL) || (USE(ANGLE) && PLATFORM(MAC))
 - (void)allocateIOSurfaceBackingStoreWithSize:(WebCore::IntSize)size usingAlpha:(BOOL)usingAlpha
 {
@@ -165 +213 @@
     _drawingBuffer->migrateColorSpaceToProperties();
     _spareBuffer->migrateColorSpaceToProperties();
+
+#if USE(ANGLE) && PLATFORM(MAC)
+    const EGLint surfaceAttributes[] = {
+        EGL_WIDTH, size.width(),
+        EGL_HEIGHT, size.height(),
+        EGL_IOSURFACE_PLANE_ANGLE, 0,
+        EGL_TEXTURE_TARGET, EGL_TEXTURE_RECTANGLE_ANGLE,
+        EGL_TEXTURE_INTERNAL_FORMAT_ANGLE, GL_BGRA_EXT,
+        EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA,
+        EGL_TEXTURE_TYPE_ANGLE, GL_UNSIGNED_BYTE,
+        EGL_NONE, EGL_NONE
+    };
+
+    _contentsPbuffer = EGL_CreatePbufferFromClientBuffer(_eglDisplay, EGL_IOSURFACE_ANGLE, _contentsBuffer->surface(), _eglConfig, surfaceAttributes);
+    _drawingPbuffer = EGL_CreatePbufferFromClientBuffer(_eglDisplay, EGL_IOSURFACE_ANGLE, _drawingBuffer->surface(), _eglConfig, surfaceAttributes);
+    _sparePbuffer = EGL_CreatePbufferFromClientBuffer(_eglDisplay, EGL_IOSURFACE_ANGLE, _spareBuffer->surface(), _eglConfig, surfaceAttributes);
+#endif
 }
 
 - (void)bindFramebufferToNextAvailableSurface
 {
+#if USE(OPENGL)
     GC3Denum texture = _context->platformTexture();
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texture);
@@ -181 +247 @@
     CGLError error = CGLTexImageIOSurface2D(_context->platformGraphicsContext3D(), GL_TEXTURE_RECTANGLE_ARB, internalFormat, _bufferSize.width(), _bufferSize.height(), GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, ioSurface, 0);
     ASSERT_UNUSED(error, error == kCGLNoError);
-}
-#endif
+#elif USE(ANGLE)
+    GC3Denum texture = _context->platformTexture();
+    gl::BindTexture(GL_TEXTURE_RECTANGLE_ANGLE, texture);
+
+    if (_latchedPbuffer) {
+        if (!EGL_ReleaseTexImage(_eglDisplay, _latchedPbuffer, EGL_BACK_BUFFER)) {
+            // FIXME: report error.
+            notImplemented();
+        }
+        _latchedPbuffer = nullptr;
+    }
+
+    if (_drawingBuffer && _drawingBuffer->isInUse()) {
+        std::swap(_drawingBuffer, _spareBuffer);
+        std::swap(_drawingPbuffer, _sparePbuffer);
+    }
+
+    // Link the IOSurface to the texture via the previously-created pbuffer.
+    if (!EGL_BindTexImage(_eglDisplay, _drawingPbuffer, EGL_BACK_BUFFER)) {
+        // FIXME: report error.
+        notImplemented();
+    }
+    _latchedPbuffer = _drawingPbuffer;
+#endif
+}
+#endif // USE(OPENGL) || (USE(ANGLE) && PLATFORM(MAC))
 
 @end