Changeset 279298 in webkit

Timestamp:

Jun 25, 2021, 3:06:49 PM (5 years ago)

Author:

dino@apple.com

Message:

Add support for MTLSharedTextures in WebXR
​https://bugs.webkit.org/show_bug.cgi?id=227245
<rdar://problem/79591620>

Reviewed by Tim Horton.

Source/WebCore:

Sometimes, the IOSurface passed to WebXR come from a shared MTLTexture. In
this case we can't treat the IOSurface data as a regular single-plane
image. Instead we should use it to recreate the MTLTexture and then
bind that to WebGL's framebuffer.

• Modules/webxr/WebXROpaqueFramebuffer.cpp: Use some new binding methods on GraphicsContextGLOpenGL

if given a shared texture.
(WebCore::WebXROpaqueFramebuffer::startFrame):
(WebCore::WebXROpaqueFramebuffer::endFrame):

• Modules/webxr/WebXROpaqueFramebuffer.h:
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm: New methods to link an

IOSurface to a GL texture, going through a MTLSharedTexture.
(WebCore::GraphicsContextGLOpenGL::attachIOSurfaceToSharedTexture):
(WebCore::GraphicsContextGLOpenGL::detachIOSurfaceFromSharedTexture):

• platform/graphics/opengl/GraphicsContextGLOpenGL.h:
• platform/xr/PlatformXR.h: Add a new "isShared" member to LayerData

to differentiate between normal IOSurfaces and those that came
from a shared texture.
(PlatformXR::Device::FrameData::LayerData::encode const):
(PlatformXR::Device::FrameData::LayerData::decode):

Source/WebCore/PAL:

Define MTLSharedTextureHandle's initWithIOSurface.

• pal/spi/cocoa/MetalSPI.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webxr/WebXROpaqueFramebuffer.cpp (modified) (3 diffs)
• Modules/webxr/WebXROpaqueFramebuffer.h (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/spi/cocoa/MetalSPI.h (modified) (3 diffs)
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContextGLOpenGL.h (modified) (1 diff)
• platform/xr/PlatformXR.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-22  Dean Jackson  <dino@apple.com>
+
+        Add support for MTLSharedTextures in WebXR
+        https://bugs.webkit.org/show_bug.cgi?id=227245
+        <rdar://problem/79591620>
+
+        Reviewed by Tim Horton.
+
+        Sometimes, the IOSurface passed to WebXR come from a shared MTLTexture. In
+        this case we can't treat the IOSurface data as a regular single-plane
+        image. Instead we should use it to recreate the MTLTexture and then
+        bind that to WebGL's framebuffer.
+
+        * Modules/webxr/WebXROpaqueFramebuffer.cpp: Use some new binding methods on GraphicsContextGLOpenGL
+        if given a shared texture.
+        (WebCore::WebXROpaqueFramebuffer::startFrame):
+        (WebCore::WebXROpaqueFramebuffer::endFrame):
+        * Modules/webxr/WebXROpaqueFramebuffer.h:
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm: New methods to link an
+        IOSurface to a GL texture, going through a MTLSharedTexture.
+        (WebCore::GraphicsContextGLOpenGL::attachIOSurfaceToSharedTexture):
+        (WebCore::GraphicsContextGLOpenGL::detachIOSurfaceFromSharedTexture):
+        * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+        * platform/xr/PlatformXR.h: Add a new "isShared" member to LayerData
+        to differentiate between normal IOSurfaces and those that came
+        from a shared texture.
+        (PlatformXR::Device::FrameData::LayerData::encode const):
+        (PlatformXR::Device::FrameData::LayerData::decode):
+
 2021-06-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp

@@ -126 +126 @@
     GCGLenum textureTarget = GraphicsContextGLOpenGL::drawingBufferTextureTarget();
 
-    auto size = data.surface->size();
-    if (!size.width() || !size.height())
-        return;
 
     if (!m_opaqueTexture)
@@ -140 +137 @@
 
     // Tell the GraphicsContextGL to use the IOSurface as the backing store for m_opaqueTexture.
-    m_ioSurfaceTextureHandle = gCGL->createPbufferAndAttachIOSurface(textureTarget, GraphicsContextGLOpenGL::PbufferAttachmentUsage::Write, GL::BGRA, size.width(), size.height(), GL::UNSIGNED_BYTE, data.surface->surface(), 0);
-    if (!m_ioSurfaceTextureHandle && m_opaqueTexture) {
+    if (data.isShared) {
+        m_ioSurfaceTextureHandle = gCGL->attachIOSurfaceToSharedTexture(textureTarget, data.surface.get());
+        m_ioSurfaceTextureHandleIsShared = true;
+    } else {
+        auto size = data.surface->size();
+        if (!size.width() || !size.height())
+            return;
+        m_ioSurfaceTextureHandle = gCGL->createPbufferAndAttachIOSurface(textureTarget, GraphicsContextGLOpenGL::PbufferAttachmentUsage::Write, GL::BGRA, size.width(), size.height(), GL::UNSIGNED_BYTE, data.surface->surface(), 0);
+        m_ioSurfaceTextureHandleIsShared = false;
+    }
+
+    if (!m_ioSurfaceTextureHandle) {
         gCGL->deleteTexture(m_opaqueTexture);
+        m_opaqueTexture = 0;
         return;
     }
-
-    // FIXME: This is assuming multisampling is turned off and we're rendering directly into the framebuffer.
 
     // Now set up the framebuffer to use the texture that points to the IOSurface. The depth and
     // stencil buffers were attached by startFrame.
     gl.framebufferTexture2D(GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0, GL::TEXTURE_2D, m_opaqueTexture, 0);
+
+    // FIXME: This is assuming multisampling is turned off and we're rendering directly into the framebuffer.
 
     // At this point the framebuffer should be "complete".
@@ -188 +196 @@
     if (m_ioSurfaceTextureHandle) {
         auto gCGL = static_cast<GraphicsContextGLOpenGL*>(&gl);
-        gCGL->destroyPbufferAndDetachIOSurface(m_ioSurfaceTextureHandle);
+        if (m_ioSurfaceTextureHandleIsShared)
+            gCGL->detachIOSurfaceFromSharedTexture(m_ioSurfaceTextureHandle);
+        else
+            gCGL->destroyPbufferAndDetachIOSurface(m_ioSurfaceTextureHandle);
+        m_ioSurfaceTextureHandle = nullptr;
+        m_ioSurfaceTextureHandleIsShared = false;
     }
 #else

trunk/Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.h

@@ -80 +80 @@
 #if USE(IOSURFACE_FOR_XR_LAYER_DATA)
     void* m_ioSurfaceTextureHandle { nullptr };
+    bool m_ioSurfaceTextureHandleIsShared { false };
 #endif
 };

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-06-22  Dean Jackson  <dino@apple.com>
+
+        Add support for MTLSharedTextures in WebXR
+        https://bugs.webkit.org/show_bug.cgi?id=227245
+        <rdar://problem/79591620>
+
+        Reviewed by Tim Horton.
+
+        Define MTLSharedTextureHandle's initWithIOSurface.
+
+        * pal/spi/cocoa/MetalSPI.h:
+
 2021-06-25  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/MetalSPI.h

@@ -26 +26 @@
 #if USE(APPLE_INTERNAL_SDK)
 
+#import <Metal/MTLTexture_Private.h>
 #import <Metal/MetalPrivate.h>
 
@@ -31 +32 @@
 
 #import <Foundation/NSObject.h>
+
+typedef struct __IOSurface *IOSurfaceRef;
 
 @protocol MTLDeviceSPI <MTLDevice>
@@ -42 +45 @@
 @end
 
+@interface MTLSharedTextureHandle(Private)
+- (instancetype)initWithIOSurface:(IOSurfaceRef)ioSurface label:(NSString*)label;
+@end
+
 #endif

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

@@ -38 +38 @@
 #import <CoreGraphics/CGBitmapContext.h>
 #import <Metal/Metal.h>
+#import <pal/spi/cocoa/MetalSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/darwin/WeakLinking.h>
@@ -685 +686 @@
 }
 
+void* GraphicsContextGLOpenGL::attachIOSurfaceToSharedTexture(GCGLenum target, IOSurface* surface)
+{
+    constexpr EGLint emptyAttributes[] = { EGL_NONE };
+
+    // Create a MTLTexture out of the IOSurface.
+    // FIXME: We need to use the same device that ANGLE is using, which might not be the default.
+
+    RetainPtr<MTLSharedTextureHandle> handle = adoptNS([[MTLSharedTextureHandle alloc] initWithIOSurface:surface->surface() label:@"WebXR"]);
+    if (!handle) {
+        LOG(WebGL, "Unable to create a MTLSharedTextureHandle from the IOSurface in attachIOSurfaceToTexture.");
+        return nullptr;
+    }
+
+    if (!handle.get().device) {
+        LOG(WebGL, "MTLSharedTextureHandle does not have a Metal device in attachIOSurfaceToTexture.");
+        return nullptr;
+    }
+
+    auto texture = adoptNS([handle.get().device newSharedTextureWithHandle:handle.get()]);
+    if (!texture) {
+        LOG(WebGL, "Unable to create a MTLSharedTexture from the texture handle in attachIOSurfaceToTexture.");
+        return nullptr;
+    }
+
+    // FIXME: Does the texture have the correct usage mode?
+
+    // Create an EGLImage out of the MTLTexture
+    auto display = platformDisplay();
+    auto eglImage = EGL_CreateImageKHR(display, EGL_NO_CONTEXT, EGL_METAL_TEXTURE_ANGLE, reinterpret_cast<EGLClientBuffer>(texture.get()), emptyAttributes);
+    if (!eglImage) {
+        LOG(WebGL, "Unable to create an EGLImage from the Metal handle in attachIOSurfaceToTexture.");
+        return nullptr;
+    }
+
+    // Tell the currently bound texture to use the EGLImage.
+    gl::EGLImageTargetTexture2DOES(target, eglImage);
+
+    return eglImage;
+}
+
+void GraphicsContextGLOpenGL::detachIOSurfaceFromSharedTexture(void* handle)
+{
+    auto display = platformDisplay();
+    EGL_DestroyImageKHR(display, handle);
+}
 
 bool GraphicsContextGLOpenGL::isGLES2Compliant() const

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h

@@ -537 +537 @@
     void* createPbufferAndAttachIOSurface(GCGLenum target, PbufferAttachmentUsage, GCGLenum internalFormat, GCGLsizei width, GCGLsizei height, GCGLenum type, IOSurfaceRef, GCGLuint plane);
     void destroyPbufferAndDetachIOSurface(void* handle);
+    void* attachIOSurfaceToSharedTexture(GCGLenum target, IOSurface*);
+    void detachIOSurfaceFromSharedTexture(void* handle);
 #endif
 

trunk/Source/WebCore/platform/xr/PlatformXR.h

@@ -174 +174 @@
 #if USE(IOSURFACE_FOR_XR_LAYER_DATA)
             std::unique_ptr<WebCore::IOSurface> surface;
+            bool isShared { false };
 #else
             PlatformGLObject opaqueTexture { 0 };
@@ -443 +444 @@
     WTF::MachSendRight surfaceSendRight = surface ? surface->createSendRight() : WTF::MachSendRight();
     encoder << surfaceSendRight;
+    encoder << isShared;
 #else
     encoder << opaqueTexture;
@@ -457 +459 @@
         return std::nullopt;
     layerData.surface = WebCore::IOSurface::createFromSendRight(WTFMove(surfaceSendRight), WebCore::DestinationColorSpace::SRGB());
+    if (!decoder.decode(layerData.isShared))
+        return std::nullopt;
 #else
     if (!decoder.decode(layerData.opaqueTexture))