Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WebXR] Remove texture size from createAndBindEGLImage result #24328

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

djg
Copy link
Contributor

@djg djg commented Feb 13, 2024

cf4012b

[WebXR] Remove texture size from createAndBindEGLImage result
https://bugs.webkit.org/show_bug.cgi?id=269280
rdar://122857763

Reviewed by Mike Wyrzykowski.

Don't return the size of external image from createAndBindEGLImage. The size of
the framebuffer and external images are already known by the calling code.

* Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:
(WebCore::createAndBindCompositorTexture):
(WebCore::createAndBindCompositorBuffer):
(WebCore::WebXROpaqueFramebuffer::startFrame):
* Source/WebCore/platform/graphics/GraphicsContextGL.h:
* Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp:
(WebCore::GraphicsContextGLANGLE::createAndBindEGLImage):
* Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h:
* Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.h:
* Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
(WebCore::GraphicsContextGLCocoa::createAndBindEGLImage):
* Source/WebCore/platform/xr/PlatformXR.h:
* Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp:
(WebKit::RemoteGraphicsContextGL::createAndBindEGLImage):
* Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h:
* Source/WebKit/Shared/XR/PlatformXR.serialization.in:
* Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp:
(WebKit::RemoteGraphicsContextGLProxy::createAndBindEGLImage):
* Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h:
* Source/WebKit/WebProcess/GPU/graphics/cocoa/RemoteGraphicsContextGLProxyCocoa.mm:

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

20ccd43

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 ⏳ πŸ§ͺ api-wpe
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  gtk
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv-sim
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@djg djg self-assigned this Feb 13, 2024
@djg djg added the WebXR For bugs in WebXR label Feb 13, 2024
@djg djg requested review from kkinnunen-apple and mwyrzykowski and removed request for cdumez and JonWBedard February 13, 2024 09:22
@djg djg force-pushed the eng/webxr/refactor-eglimage branch from 47c37e2 to ba35dfb Compare February 13, 2024 09:24
@djg djg changed the title [Web [WebXR] Remove texture size from createAndBindEGLImage result Feb 13, 2024
@djg djg force-pushed the eng/webxr/refactor-eglimage branch from ba35dfb to 81b639a Compare February 14, 2024 01:48
@djg djg force-pushed the eng/webxr/refactor-eglimage branch from 81b639a to 20ccd43 Compare February 14, 2024 02:15
@djg djg added the merge-queue Applied to send a pull request to merge-queue label Feb 15, 2024
https://bugs.webkit.org/show_bug.cgi?id=269280
rdar://122857763

Reviewed by Mike Wyrzykowski.

Don't return the size of external image from createAndBindEGLImage. The size of
the framebuffer and external images are already known by the calling code.

* Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:
(WebCore::createAndBindCompositorTexture):
(WebCore::createAndBindCompositorBuffer):
(WebCore::WebXROpaqueFramebuffer::startFrame):
* Source/WebCore/platform/graphics/GraphicsContextGL.h:
* Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp:
(WebCore::GraphicsContextGLANGLE::createAndBindEGLImage):
* Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h:
* Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.h:
* Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
(WebCore::GraphicsContextGLCocoa::createAndBindEGLImage):
* Source/WebCore/platform/xr/PlatformXR.h:
* Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp:
(WebKit::RemoteGraphicsContextGL::createAndBindEGLImage):
* Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h:
* Source/WebKit/Shared/XR/PlatformXR.serialization.in:
* Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp:
(WebKit::RemoteGraphicsContextGLProxy::createAndBindEGLImage):
* Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h:
* Source/WebKit/WebProcess/GPU/graphics/cocoa/RemoteGraphicsContextGLProxyCocoa.mm:

Canonical link: https://commits.webkit.org/274682@main
@webkit-commit-queue
Copy link
Collaborator

Committed 274682@main (cf4012b): https://commits.webkit.org/274682@main

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

@webkit-commit-queue webkit-commit-queue merged commit cf4012b into WebKit:main Feb 15, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Feb 15, 2024
@djg djg deleted the eng/webxr/refactor-eglimage branch April 11, 2024 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebXR For bugs in WebXR
Projects
None yet
4 participants