Changeset 279308 in webkit

Timestamp:

Jun 26, 2021, 5:48:56 PM (5 years ago)

Author:

dino@apple.com

Message:

Build fix for iOS Simulator. MTLSharedTexture is not available
on that configuration.

• Modules/webxr/WebXROpaqueFramebuffer.cpp:

(WebCore::WebXROpaqueFramebuffer::startFrame):
(WebCore::WebXROpaqueFramebuffer::endFrame):

• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
• platform/graphics/opengl/GraphicsContextGLOpenGL.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webxr/WebXROpaqueFramebuffer.cpp (modified) (2 diffs)
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContextGLOpenGL.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-26  Dean Jackson  <dino@apple.com>
+
+        Build fix for iOS Simulator. MTLSharedTexture is not available
+        on that configuration.
+
+        * Modules/webxr/WebXROpaqueFramebuffer.cpp:
+        (WebCore::WebXROpaqueFramebuffer::startFrame):
+        (WebCore::WebXROpaqueFramebuffer::endFrame):
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+        * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+
 2021-06-25  Alan Bujtas  <zalan@apple.com>
 

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

@@ -138 +138 @@
     // Tell the GraphicsContextGL to use the IOSurface as the backing store for m_opaqueTexture.
     if (data.isShared) {
+#if !PLATFORM(IOS_FAMILY_SIMULATOR)
         m_ioSurfaceTextureHandle = gCGL->attachIOSurfaceToSharedTexture(textureTarget, data.surface.get());
         m_ioSurfaceTextureHandleIsShared = true;
+#else
+        ASSERT_NOT_REACHED();
+#endif
     } else {
         auto size = data.surface->size();
@@ -196 +200 @@
     if (m_ioSurfaceTextureHandle) {
         auto gCGL = static_cast<GraphicsContextGLOpenGL*>(&gl);
-        if (m_ioSurfaceTextureHandleIsShared)
+        if (m_ioSurfaceTextureHandleIsShared) {
+#if !PLATFORM(IOS_FAMILY_SIMULATOR)
             gCGL->detachIOSurfaceFromSharedTexture(m_ioSurfaceTextureHandle);
-        else
+#else
+            ASSERT_NOT_REACHED();
+#endif
+        } else
             gCGL->destroyPbufferAndDetachIOSurface(m_ioSurfaceTextureHandle);
         m_ioSurfaceTextureHandle = nullptr;

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

@@ -695 +695 @@
 }
 
+#if !PLATFORM(IOS_FAMILY_SIMULATOR)
 void* GraphicsContextGLOpenGL::attachIOSurfaceToSharedTexture(GCGLenum target, IOSurface* surface)
 {
@@ -740 +741 @@
     EGL_DestroyImageKHR(display, handle);
 }
+#endif
 
 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);
+#if !PLATFORM(IOS_FAMILY_SIMULATOR)
     void* attachIOSurfaceToSharedTexture(GCGLenum target, IOSurface*);
     void detachIOSurfaceFromSharedTexture(void* handle);
+#endif
 #endif