[WebXR] Pass depth texture in frame data #15396

djg · 2023-06-29T09:20:17Z

`9e2a90f`

[WebXR] Pass depth texture in frame data
https://bugs.webkit.org/show_bug.cgi?id=258661
rdar://111501806

Reviewed by Dean Jackson.

Render to compositor provided depth-stencil buffers.

* Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:
(WebCore::createAndBindCompositorTexture):
(WebCore::createAndBindCompositorBuffer):
(WebCore::makeEGLImageSource):
(WebCore::WebXROpaqueFramebuffer::create):
(WebCore::WebXROpaqueFramebuffer::~WebXROpaqueFramebuffer):
(WebCore::WebXROpaqueFramebuffer::startFrame):
(WebCore::WebXROpaqueFramebuffer::endFrame):
(WebCore::WebXROpaqueFramebuffer::setupFramebuffer):
(WebCore::WebXROpaqueFramebuffer::allocateColorStorage):
(WebCore::WebXROpaqueFramebuffer::allocateDepthStencilStorage):
(WebCore::WebXROpaqueFramebuffer::bindDepthStencilBuffer):
* Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.h:
* Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
(WebCore::GraphicsContextGLCocoa::createAndBindEGLImage):
* Source/WebCore/platform/xr/PlatformXR.h:
(PlatformXR::Device::FrameData::LayerData::encode const):
(PlatformXR::Device::FrameData::LayerData::decode):

Canonical link: https://commits.webkit.org/266053@main

bfb68e6

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-06-29T09:20:26Z

EWS run on previous version of this PR (hash 2433c35)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

grorg · 2023-06-30T19:46:22Z

Can't land at the moment though.

Thread 0 name:   Dispatch queue: com.apple.main-thread
Thread 0 Crashed:
0   libsystem_kernel.dylib        	       0x24d2382cc __pthread_kill + 8
1   libsystem_pthread.dylib       	       0x24d31019c pthread_kill + 268
2   libsystem_c.dylib             	       0x24d1a5c18 abort + 180
3   libsystem_c.dylib             	       0x24d1a4f34 __assert_rtn + 284
4   Metal                         	       0x1bb776ca4 MTLReportFailure.cold.1 + 48
5   Metal                         	       0x1bb74d5c8 MTLReportFailure + 464
6   Metal                         	       0x1bb742c98 _MTLMessageContextEnd + 860
7   Metal                         	       0x1bb6d2024 -[MTLTextureDescriptorInternal validateWithDevice:] + 2280
8   AGXMetalG14G                  	       0x1a632d558 -[AGXTexture initWithSharedTextureHandle:device:desc:compressionMode:] + 64
9   WebCore                       	       0x10ebf4000 decltype(auto) std::__1::__variant_detail::__visitation::__base::__dispatcher<0ul>::__dispatch[abi:v160002]<std::__1::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_0, WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_1>>&&, std::__1::__variant_detail::__base<(std::__1::__variant_detail::_Trait)1, WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>&&>(std::__1::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_0, WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_1>>&&, std::__1::__variant_detail::__base<(std::__1::__variant_detail::_Trait)1, WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>&&) + 120
10  WebCore                       	       0x10ebf1d9c WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>) + 148
11  WebCore                       	       0x10fa43780 WebCore::WebXROpaqueFramebuffer::startFrame(PlatformXR::Device::FrameData::LayerData const&) + 1000

webkit-early-warning-system · 2023-07-11T06:54:32Z

EWS run on previous version of this PR (hash 4d9c2cb)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-07-12T05:29:58Z

EWS run on current version of this PR (hash bfb68e6)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

djg · 2023-07-14T00:34:49Z

Can't land at the moment though.

Thread 0 name:   Dispatch queue: com.apple.main-thread
Thread 0 Crashed:
0   libsystem_kernel.dylib        	       0x24d2382cc __pthread_kill + 8
1   libsystem_pthread.dylib       	       0x24d31019c pthread_kill + 268
2   libsystem_c.dylib             	       0x24d1a5c18 abort + 180
3   libsystem_c.dylib             	       0x24d1a4f34 __assert_rtn + 284
4   Metal                         	       0x1bb776ca4 MTLReportFailure.cold.1 + 48
5   Metal                         	       0x1bb74d5c8 MTLReportFailure + 464
6   Metal                         	       0x1bb742c98 _MTLMessageContextEnd + 860
7   Metal                         	       0x1bb6d2024 -[MTLTextureDescriptorInternal validateWithDevice:] + 2280
8   AGXMetalG14G                  	       0x1a632d558 -[AGXTexture initWithSharedTextureHandle:device:desc:compressionMode:] + 64
9   WebCore                       	       0x10ebf4000 decltype(auto) std::__1::__variant_detail::__visitation::__base::__dispatcher<0ul>::__dispatch[abi:v160002]<std::__1::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_0, WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_1>>&&, std::__1::__variant_detail::__base<(std::__1::__variant_detail::_Trait)1, WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>&&>(std::__1::__variant_detail::__visitation::__variant::__value_visitor<WTF::Visitor<WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_0, WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>)::$_1>>&&, std::__1::__variant_detail::__base<(std::__1::__variant_detail::_Trait)1, WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>&&) + 120
10  WebCore                       	       0x10ebf1d9c WebCore::GraphicsContextGLCocoa::createAndBindEGLImage(unsigned int, std::__1::variant<WebCore::GraphicsContextGL::EGLImageSourceIOSurfaceHandle, WebCore::GraphicsContextGL::EGLImageSourceMTLSharedTextureHandle>) + 148
11  WebCore                       	       0x10fa43780 WebCore::WebXROpaqueFramebuffer::startFrame(PlatformXR::Device::FrameData::LayerData const&) + 1000

@mwyrzykowski tested locally and reported this is no longer an issue.

https://bugs.webkit.org/show_bug.cgi?id=258661 rdar://111501806 Reviewed by Dean Jackson. Render to compositor provided depth-stencil buffers. * Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp: (WebCore::createAndBindCompositorTexture): (WebCore::createAndBindCompositorBuffer): (WebCore::makeEGLImageSource): (WebCore::WebXROpaqueFramebuffer::create): (WebCore::WebXROpaqueFramebuffer::~WebXROpaqueFramebuffer): (WebCore::WebXROpaqueFramebuffer::startFrame): (WebCore::WebXROpaqueFramebuffer::endFrame): (WebCore::WebXROpaqueFramebuffer::setupFramebuffer): (WebCore::WebXROpaqueFramebuffer::allocateColorStorage): (WebCore::WebXROpaqueFramebuffer::allocateDepthStencilStorage): (WebCore::WebXROpaqueFramebuffer::bindDepthStencilBuffer): * Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.h: * Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm: (WebCore::GraphicsContextGLCocoa::createAndBindEGLImage): * Source/WebCore/platform/xr/PlatformXR.h: (PlatformXR::Device::FrameData::LayerData::encode const): (PlatformXR::Device::FrameData::LayerData::decode): Canonical link: https://commits.webkit.org/266053@main

webkit-commit-queue · 2023-07-14T00:59:56Z

Committed 266053@main (9e2a90f): https://commits.webkit.org/266053@main

Reviewed commits have been landed. Closing PR #15396 and removing active labels.

djg self-assigned this Jun 29, 2023

djg added the WebXR For bugs in WebXR label Jun 29, 2023

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 29, 2023

grorg approved these changes Jun 29, 2023

View reviewed changes

djg removed the merging-blocked Applied to prevent a change from being merged label Jul 11, 2023

djg force-pushed the webxr/compositor-depth-texture branch from 2433c35 to 4d9c2cb Compare July 11, 2023 06:54

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jul 11, 2023

djg removed the merging-blocked Applied to prevent a change from being merged label Jul 12, 2023

djg force-pushed the webxr/compositor-depth-texture branch from 4d9c2cb to bfb68e6 Compare July 12, 2023 05:29

djg added the merge-queue Applied to send a pull request to merge-queue label Jul 14, 2023

webkit-commit-queue force-pushed the webxr/compositor-depth-texture branch from bfb68e6 to 9e2a90f Compare July 14, 2023 00:59

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jul 14, 2023

webkit-commit-queue merged commit 9e2a90f into WebKit:main Jul 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WebXR] Pass depth texture in frame data #15396

[WebXR] Pass depth texture in frame data #15396

djg commented Jun 29, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Jun 29, 2023 •

edited

grorg commented Jun 30, 2023

webkit-early-warning-system commented Jul 11, 2023 •

edited

webkit-early-warning-system commented Jul 12, 2023 •

edited

djg commented Jul 14, 2023

webkit-commit-queue commented Jul 14, 2023

[WebXR] Pass depth texture in frame data #15396

[WebXR] Pass depth texture in frame data #15396

Conversation

djg commented Jun 29, 2023 • edited by webkit-early-warning-system

9e2a90f

webkit-early-warning-system commented Jun 29, 2023 • edited

grorg commented Jun 30, 2023

webkit-early-warning-system commented Jul 11, 2023 • edited

webkit-early-warning-system commented Jul 12, 2023 • edited

djg commented Jul 14, 2023

webkit-commit-queue commented Jul 14, 2023

djg commented Jun 29, 2023 •

edited by webkit-early-warning-system

`9e2a90f`

webkit-early-warning-system commented Jun 29, 2023 •

edited

webkit-early-warning-system commented Jul 11, 2023 •

edited

webkit-early-warning-system commented Jul 12, 2023 •

edited