Changeset 278528 in webkit

Timestamp:

Jun 5, 2021, 4:22:30 PM (4 years ago)

Author:

dino@apple.com

Message:

[WebXR] Supply an IOSurface in SimulatedXRDevice
​https://bugs.webkit.org/show_bug.cgi?id=226564
<rdar://problem/78793086>

Reviewed by Sam Weinig.

Rather than handle the case where we get a null IOSurface,
have the SimulatedXRDevice create one on each frame.

• Modules/webxr/WebXROpaqueFramebuffer.cpp:

(WebCore::WebXROpaqueFramebuffer::startFrame):

• testing/WebFakeXRDevice.cpp:

(WebCore::SimulatedXRDevice::frameTimerFired):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webxr/WebXROpaqueFramebuffer.cpp (modified) (1 diff)
• testing/WebFakeXRDevice.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-05  Dean Jackson  <dino@apple.com>
+
+        [WebXR] Supply an IOSurface in SimulatedXRDevice
+        https://bugs.webkit.org/show_bug.cgi?id=226564
+        <rdar://problem/78793086>
+
+        Reviewed by Sam Weinig.
+
+        Rather than handle the case where we get a null IOSurface,
+        have the SimulatedXRDevice create one on each frame.
+
+        * Modules/webxr/WebXROpaqueFramebuffer.cpp:
+        (WebCore::WebXROpaqueFramebuffer::startFrame):
+        * testing/WebFakeXRDevice.cpp:
+        (WebCore::SimulatedXRDevice::frameTimerFired):
+
 2021-06-05  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -121 +121 @@
 
 #if USE(IOSURFACE_FOR_XR_LAYER_DATA)
-    if (!data.surface)
-        return;
+    ASSERT(data.surface);
 
     auto gCGL = static_cast<GraphicsContextGLOpenGL*>(m_context.graphicsContextGL());

trunk/Source/WebCore/testing/WebFakeXRDevice.cpp

@@ -36 +36 @@
 #include <wtf/MathExtras.h>
 
+#if USE(IOSURFACE_FOR_XR_LAYER_DATA)
+#include "IOSurface.h"
+#endif
+
 namespace WebCore {
 
@@ -147 +151 @@
     for (auto& layer : m_layers) {
 #if USE(IOSURFACE_FOR_XR_LAYER_DATA)
-        data.layers.add(layer.key, FrameData::LayerData { });
+        data.layers.add(layer.key, FrameData::LayerData { .surface = IOSurface::create(recommendedResolution(PlatformXR::SessionMode::ImmersiveVr), DestinationColorSpace::SRGB()) });
 #else
         data.layers.add(layer.key, FrameData::LayerData { .opaqueTexture = layer.value });