Changeset 276567 in webkit

Timestamp:

Apr 25, 2021, 12:06:07 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[Metal ANGLE] Select proper IOSurface backing format for WebGL environment
​https://bugs.webkit.org/show_bug.cgi?id=224948
<rdar://76284889>

Depending on the architecture, WebCore expects different
IOSurface texture targets for the main buffer. When running catalyst on
Arm64 devices, Metal-ANGLE needs to select the TEXTURE_2D texture target for our
IOSurface/Pbuffer bind point, rather than TEXTURE_RECTANGLE.

Reviewed by Dean Jackson.

Patch by Kyle Piddington <Kyle Piddington> on 2021-04-25

• src/libANGLE/renderer/metal/DisplayMtl.h:
• src/libANGLE/renderer/metal/DisplayMtl.mm:

(rx::needsEAGLOnMac):
(rx::DisplayMtl::EGLDrawingBufferTextureTarget):
(rx::DisplayMtl::generateConfigs):

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/renderer/metal/DisplayMtl.h (modified) (1 diff)
• src/libANGLE/renderer/metal/DisplayMtl.mm (modified) (2 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-04-25  Kyle Piddington  <kpiddington@apple.com>
+
+        [Metal ANGLE] Select proper IOSurface backing format for WebGL environment
+        https://bugs.webkit.org/show_bug.cgi?id=224948
+        <rdar://76284889>
+
+        Depending on the architecture, WebCore expects different 
+        IOSurface texture targets for the main buffer. When running catalyst on 
+        Arm64 devices, Metal-ANGLE needs to select the TEXTURE_2D texture target for our
+        IOSurface/Pbuffer bind point, rather than TEXTURE_RECTANGLE.
+
+        Reviewed by Dean Jackson.
+
+        * src/libANGLE/renderer/metal/DisplayMtl.h:
+        * src/libANGLE/renderer/metal/DisplayMtl.mm:
+        (rx::needsEAGLOnMac):
+        (rx::DisplayMtl::EGLDrawingBufferTextureTarget):
+        (rx::DisplayMtl::generateConfigs):
+
 2021-04-23  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.h

@@ -166 +166 @@
     void initializeFeatures();
     void initializeLimitations();
+    EGLenum EGLDrawingBufferTextureTarget();
     id<MTLDevice> getMetalDeviceMatchingAttribute(const egl::AttributeMap &attribs);
     angle::Result initializeShaderLibrary();

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/DisplayMtl.mm

@@ -438 +438 @@
 void DisplayMtl::populateFeatureList(angle::FeatureList *features) {}
 
+#if TARGET_OS_MACCATALYST
+static bool needsEAGLOnMac()
+{
+#if defined(__arm64__) || defined(__aarch64__)
+    return true;
+#else
+    return false;
+#endif
+}
+#endif
+
+EGLenum DisplayMtl::EGLDrawingBufferTextureTarget()
+{
+#if TARGET_OS_MACCATALYST
+    if (needsEAGLOnMac())
+        return EGL_TEXTURE_2D;
+    return EGL_TEXTURE_RECTANGLE_ANGLE;
+#elif TARGET_OS_OSX
+    return EGL_TEXTURE_RECTANGLE_ANGLE;
+#else
+    return EGL_TEXTURE_2D;
+#endif
+}
 egl::ConfigSet DisplayMtl::generateConfigs()
 {
@@ -461 +484 @@
 
     // Pbuffer
-#if TARGET_OS_OSX || TARGET_OS_MACCATALYST
-    config.bindToTextureTarget = EGL_TEXTURE_RECTANGLE_ANGLE;
-#else
-    config.bindToTextureTarget = EGL_TEXTURE_2D;
-#endif
+    config.bindToTextureTarget = EGLDrawingBufferTextureTarget();
     config.maxPBufferWidth  = 4096;
     config.maxPBufferHeight = 4096;