griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: OpenXR: Add begin and end submit swapchain handler

Browse Source 
Graphics bindings would be able to share resources more easily.
Extracted from !139140

Pull Request: https://projects.blender.org/blender/blender/pulls/139155
This commit is contained in:
Jeroen Bakker
2025-05-20 14:04:45 +02:00
parent 5f5c06fc24
commit 60990f6b72
7 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_IXrGraphicsBinding.hh
View File

@@ -54,8 +54,10 @@ class GHOST_IXrGraphicsBinding {
bool &r_is_rgb_format) const = 0;
virtual std::vector<XrSwapchainImageBaseHeader *> createSwapchainImages(
uint32_t image_count) = 0;
virtual void submitToSwapchainBegin() = 0;
virtual void submitToSwapchainImage(XrSwapchainImageBaseHeader &swapchain_image,
const GHOST_XrDrawViewInfo &draw_info) = 0;
virtual void submitToSwapchainEnd() = 0;
virtual bool needsUpsideDownDrawing(GHOST_Context &ghost_ctx) const = 0;
protected:

2
intern/ghost/intern/GHOST_XrGraphicsBinding.cc
View File

@@ -269,6 +269,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
return base_images;
}
void submitToSwapchainBegin() override {}
void submitToSwapchainImage(XrSwapchainImageBaseHeader &swapchain_image,
const GHOST_XrDrawViewInfo &draw_info) override
{
@@ -293,6 +294,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
void submitToSwapchainEnd() override {}
bool needsUpsideDownDrawing(GHOST_Context &ghost_ctx) const override
{

3
intern/ghost/intern/GHOST_XrGraphicsBindingD3D.hh
View File

@@ -44,6 +44,9 @@ class GHOST_XrGraphicsBindingD3D : public GHOST_IXrGraphicsBinding {
bool &r_is_srgb_format) const override;
std::vector<XrSwapchainImageBaseHeader *> createSwapchainImages(uint32_t image_count) override;
void submitToSwapchainBegin() override {}
void submitToSwapchainEnd() override {}
bool needsUpsideDownDrawing(GHOST_Context &ghost_ctx) const override;
protected:

2
intern/ghost/intern/GHOST_XrGraphicsBindingVulkan.cc
View File

@@ -423,6 +423,7 @@ std::vector<XrSwapchainImageBaseHeader *> GHOST_XrGraphicsBindingVulkan::createS
return base_images;
}
void GHOST_XrGraphicsBindingVulkan::submitToSwapchainBegin() {}
void GHOST_XrGraphicsBindingVulkan::submitToSwapchainImage(
XrSwapchainImageBaseHeader &swapchain_image, const GHOST_XrDrawViewInfo &draw_info)
{
@@ -440,6 +441,7 @@ void GHOST_XrGraphicsBindingVulkan::submitToSwapchainImage(
break;
}
}
void GHOST_XrGraphicsBindingVulkan::submitToSwapchainEnd() {}
/* -------------------------------------------------------------------- */
/** \name Data transfer CPU

2
intern/ghost/intern/GHOST_XrGraphicsBindingVulkan.hh
View File

@@ -38,8 +38,10 @@ class GHOST_XrGraphicsBindingVulkan : public GHOST_IXrGraphicsBinding {
bool &r_is_srgb_format) const override;
std::vector<XrSwapchainImageBaseHeader *> createSwapchainImages(uint32_t image_count) override;
void submitToSwapchainBegin() override;
void submitToSwapchainImage(XrSwapchainImageBaseHeader &swapchain_image,
const GHOST_XrDrawViewInfo &draw_info) override;
void submitToSwapchainEnd() override;
bool needsUpsideDownDrawing(GHOST_Context &ghost_ctx) const override;

29
intern/ghost/intern/GHOST_XrSession.cc
View File

@@ -493,21 +493,20 @@ static void ghost_xr_draw_view_info_from_view(const XrView &view, GHOST_XrDrawVi
}
void GHOST_XrSession::drawView(GHOST_XrSwapchain &swapchain,
XrSwapchainImageBaseHeader &swapchain_image,
XrCompositionLayerProjectionView &r_proj_layer_view,
const XrSpaceLocation &view_location,
const XrView &view,
uint32_t view_idx,
void *draw_customdata)
{
XrSwapchainImageBaseHeader *swapchain_image = swapchain.acquireDrawableSwapchainImage();
GHOST_XrDrawViewInfo draw_view_info = {};
r_proj_layer_view.type = XR_TYPE_COMPOSITION_LAYER_PROJECTION_VIEW;
r_proj_layer_view.pose = view.pose;
r_proj_layer_view.fov = view.fov;
swapchain.updateCompositionLayerProjectViewSubImage(r_proj_layer_view.subImage);
assert(view_idx < 256);
GHOST_XrDrawViewInfo draw_view_info = {};
draw_view_info.view_idx = char(view_idx);
draw_view_info.swapchain_format = swapchain.getFormat();
draw_view_info.expects_srgb_buffer = swapchain.isBufferSRGB();
@@ -520,9 +519,7 @@ void GHOST_XrSession::drawView(GHOST_XrSwapchain &swapchain,
/* Draw! */
m_context->getCustomFuncs().draw_view_fn(&draw_view_info, draw_customdata);
m_gpu_binding->submitToSwapchainImage(*swapchain_image, draw_view_info);
swapchain.releaseImage();
m_gpu_binding->submitToSwapchainImage(swapchain_image, draw_view_info);
}
XrCompositionLayerProjection GHOST_XrSession::drawLayer(
@@ -560,15 +557,33 @@ XrCompositionLayerProjection GHOST_XrSession::drawLayer(
"Failed to query frame view space");
r_proj_layer_views.resize(view_count);
std::vector<XrSwapchainImageBaseHeader *> swapchain_images;
swapchain_images.resize(view_count);
for (uint32_t view_idx = 0; view_idx < view_count; view_idx++) {
drawView(m_oxr->swapchains[view_idx],
GHOST_XrSwapchain &swapchain = m_oxr->swapchains[view_idx];
swapchain_images[view_idx] = swapchain.acquireDrawableSwapchainImage();
}
m_gpu_binding->submitToSwapchainBegin();
for (uint32_t view_idx = 0; view_idx < view_count; view_idx++) {
GHOST_XrSwapchain &swapchain = m_oxr->swapchains[view_idx];
XrSwapchainImageBaseHeader &swapchain_image = *swapchain_images[view_idx];
drawView(swapchain,
swapchain_image,
r_proj_layer_views[view_idx],
view_location,
m_oxr->views[view_idx],
view_idx,
draw_customdata);
}
m_gpu_binding->submitToSwapchainEnd();
for (uint32_t view_idx = 0; view_idx < view_count; view_idx++) {
GHOST_XrSwapchain &swapchain = m_oxr->swapchains[view_idx];
swapchain.releaseImage();
swapchain_images[view_idx] = nullptr;
}
layer.space = m_oxr->reference_space;
layer.viewCount = r_proj_layer_views.size();

1
intern/ghost/intern/GHOST_XrSession.hh
View File

@@ -108,6 +108,7 @@ class GHOST_XrSession {
XrCompositionLayerProjection drawLayer(
std::vector<XrCompositionLayerProjectionView> &r_proj_layer_views, void *draw_customdata);
void drawView(GHOST_XrSwapchain &swapchain,
XrSwapchainImageBaseHeader &swapchain_image,
XrCompositionLayerProjectionView &r_proj_layer_view,
const XrSpaceLocation &view_location,
const XrView &view,