Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

VisionOS: Remove support. (#3479)

Browse Source
This commit is contained in:
Бранимир Караџић
2025-10-31 13:42:42 -07:00
committed by GitHub
parent 5e39256f99
commit ddc98ad65a
2 changed files with 5 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/renderer_mtl.h
View File

@@ -18,10 +18,6 @@
# import <UIKit/UIKit.h>
#endif // BX_PLATFORM_*
#if BX_PLATFORM_VISIONOS
# import <CompositorServices/CompositorServices.h>
#endif // BX_PLATFORM_VISIONOS
#define BGFX_MTL_PROFILER_BEGIN(_view, _abgr) \
BX_MACRO_BLOCK_BEGIN \
BGFX_PROFILER_BEGIN(s_viewName[view], _abgr); \
@@ -1247,12 +1243,6 @@ namespace bgfx { namespace mtl
{
SwapChainMtl()
: m_metalLayer(NULL)
#if BX_PLATFORM_VISIONOS
, m_layerRenderer(NULL)
, m_layerRendererDrawable(NULL)
, m_frame(NULL)
, m_useLayerRenderer(true)
#endif // BX_PLATFORM_VISIONOS
, m_drawable(NULL)
, m_drawableTexture(NULL)
, m_backBufferColorMsaa()
@@ -1273,13 +1263,6 @@ namespace bgfx { namespace mtl
id<MTLTexture> currentDrawableTexture();
CAMetalLayer* m_metalLayer;
#if BX_PLATFORM_VISIONOS
cp_layer_renderer_t m_layerRenderer;
cp_drawable_t m_layerRendererDrawable;
cp_layer_renderer_configuration_t m_layerRendererConfiguration;
cp_frame_t m_frame;
bool m_useLayerRenderer;
#endif // BX_PLATFORM_VISIONOS
id<CAMetalDrawable> m_drawable;
id<MTLTexture> m_drawableTexture;

272
src/renderer_mtl.mm
View File

@@ -819,26 +819,9 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
m_textVideoMem.resize(false, m_resolution.width, m_resolution.height);
m_textVideoMem.clear();
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
m_deviceAnchor = ar_device_anchor_create();
m_worldTracking = ar_world_tracking_provider_create(ar_world_tracking_configuration_create() );
m_arSession = ar_session_create();
ar_session_run(m_arSession, ar_data_providers_create_with_data_providers(m_worldTracking, nil) );
}
#endif // BX_PLATFORM_VISIONOS
m_numWindows = 1;
#if BX_PLATFORM_VISIONOS
bool useLayerRenderer = m_mainFrameBuffer.m_swapChain->m_useLayerRenderer;
if ( (useLayerRenderer && NULL == m_mainFrameBuffer.m_swapChain->m_layerRenderer)
|| (!useLayerRenderer && NULL == m_mainFrameBuffer.m_swapChain->m_metalLayer)
)
#else
if (NULL == m_mainFrameBuffer.m_swapChain->m_metalLayer)
#endif // BX_PLATFORM_VISIONOS
{
MTL_RELEASE(m_device, 0);
return false;
@@ -896,13 +879,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
reset(m_renderPipelineDescriptor);
m_renderPipelineDescriptor.colorAttachments[0].pixelFormat = getSwapChainPixelFormat(m_mainFrameBuffer.m_swapChain);
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
m_renderPipelineDescriptor.depthAttachmentPixelFormat = cp_layer_renderer_configuration_get_depth_format(m_mainFrameBuffer.m_swapChain->m_layerRendererConfiguration);
}
#endif // BX_PLATFORM_VISIONOS
m_renderPipelineDescriptor.vertexFunction = m_screenshotBlitProgram.m_vsh->m_function;
m_renderPipelineDescriptor.fragmentFunction = m_screenshotBlitProgram.m_fsh->m_function;
m_screenshotBlitRenderPipelineState = m_device.newRenderPipelineStateWithDescriptor(m_renderPipelineDescriptor);
@@ -952,16 +928,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
MTL_RELEASE(m_vertexDescriptor, 0);
MTL_RELEASE(m_samplerDescriptor, 0);
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
ar_session_stop(m_arSession);
MTL_RELEASE(m_arSession, 0);
MTL_RELEASE(m_worldTracking, 0);
MTL_RELEASE(m_deviceAnchor, 0);
}
#endif // BX_PLATFORM_VISIONOS
m_mainFrameBuffer.destroy();
m_cmd.shutdown();
@@ -1100,14 +1066,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
MTLPixelFormat getSwapChainPixelFormat(SwapChainMtl *swapChain)
{
#if BX_PLATFORM_VISIONOS
if (swapChain->m_useLayerRenderer)
{
cp_layer_renderer_configuration_t layerConfiguration = cp_layer_renderer_get_configuration(swapChain->m_layerRenderer);
return cp_layer_renderer_configuration_get_color_format(layerConfiguration);
}
#endif // BX_PLATFORM_VISIONOS
return swapChain->m_metalLayer.pixelFormat;
}
@@ -1357,35 +1315,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
BX_UNUSED(_blitter);
}
#if BX_PLATFORM_VISIONOS
void calculateViewPorts(MTLViewport (&viewports)[2])
{
const int viewCount = 2;
for (int i = 0; i < viewCount; i++)
{
cp_view_t view = cp_drawable_get_view(m_mainFrameBuffer.m_swapChain->m_layerRendererDrawable, i);
cp_view_texture_map_t texture_map = cp_view_get_view_texture_map(view);
viewports[i] = cp_view_texture_map_get_viewport(texture_map);
}
}
void setVertexAmplification(RenderCommandEncoder& _rce)
{
MTLVertexAmplificationViewMapping mapping0;
MTLVertexAmplificationViewMapping mapping1;
mapping0.renderTargetArrayIndexOffset = 0;
mapping1.renderTargetArrayIndexOffset = 1;
mapping0.viewportArrayIndexOffset = 1;
mapping1.viewportArrayIndexOffset = 2;
MTLVertexAmplificationViewMapping mappings[] = { mapping0, mapping1 };
_rce.setVertexAmplificationCount(2, mappings);
}
#endif // BX_PLATFORM_VISIONOS
void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override
{
const uint32_t numVertices = _numIndices*4/6;
@@ -1427,19 +1356,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
m_renderCommandEncoderFrameBufferHandle = fbh;
MTL_RELEASE(renderPassDescriptor, 0);
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
if (cp_layer_renderer_configuration_get_layout(m_mainFrameBuffer.m_swapChain->m_layerRendererConfiguration) == cp_layer_renderer_layout_layered)
{
MTLViewport viewports[2];
calculateViewPorts(viewports);
rce.setViewports(viewports, 2);
setVertexAmplification(rce);
}
}
else
#endif // BX_PLATFORM_VISIONOS
{
MTLViewport viewport = { 0.0f, 0.0f, (float)width, (float)height, 0.0f, 1.0f };
rce.setViewport(viewport);
@@ -1519,19 +1435,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
return false;
}
#if BX_PLATFORM_VISIONOS
void createPoseForTiming(cp_frame_timing_t timing, ar_world_tracking_provider_t world_tracking)
{
cp_time_t presentationTime = cp_frame_timing_get_presentation_time(timing);
CFTimeInterval queryTime = cp_time_to_cf_time_interval(presentationTime);
ar_device_anchor_query_status_t status = ar_world_tracking_provider_query_device_anchor_at_timestamp(world_tracking, queryTime, m_deviceAnchor);
if (status != ar_device_anchor_query_status_success)
{
BX_WARN(false, "Device anchor query failed.")
}
}
#endif // BX_PLATFORM_VISIONOS
void flip() override
{
if (NULL == m_commandBuffer)
@@ -1547,23 +1450,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
{
MTL_RELEASE_I(frameBuffer.m_swapChain->m_drawableTexture);
#if BX_PLATFORM_VISIONOS
if (frameBuffer.m_swapChain->m_useLayerRenderer)
{
if (NULL != frameBuffer.m_swapChain->m_layerRendererDrawable)
{
if (m_worldTracking != NULL)
{
auto timingInfo = cp_drawable_get_frame_timing(frameBuffer.m_swapChain->m_layerRendererDrawable);
createPoseForTiming(timingInfo, m_worldTracking);
cp_drawable_set_device_anchor(frameBuffer.m_swapChain->m_layerRendererDrawable, m_deviceAnchor);
}
cp_drawable_encode_present(frameBuffer.m_swapChain->m_layerRendererDrawable, m_commandBuffer);
cp_frame_end_submission(frameBuffer.m_swapChain->m_frame);
}
}
else
#endif // BX_PLATFORM_VISIONOS
{
if (NULL != frameBuffer.m_swapChain->m_drawable)
{
@@ -2012,26 +1898,6 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
;
}
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
Texture texture = cp_drawable_get_depth_texture(swapChain->m_layerRendererDrawable, 0);
_renderPassDescriptor.depthAttachment.texture = texture;
_renderPassDescriptor.stencilAttachment.texture = swapChain->m_backBufferStencil;
cp_layer_renderer_configuration_t layerConfiguration = cp_layer_renderer_get_configuration(swapChain->m_layerRenderer);
cp_layer_renderer_layout layout = cp_layer_renderer_configuration_get_layout(layerConfiguration);
if (layout == cp_layer_renderer_layout_layered)
{
_renderPassDescriptor.renderTargetArrayLength = cp_drawable_get_view_count(swapChain->m_layerRendererDrawable);
}
else
{
_renderPassDescriptor.renderTargetArrayLength = 1;
}
}
else
#endif // BX_PLATFORM_VISIONOS
{
_renderPassDescriptor.depthAttachment.texture = swapChain->m_backBufferDepth;
_renderPassDescriptor.stencilAttachment.texture = swapChain->m_backBufferStencil;
@@ -2412,13 +2278,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
: 1
;
pd.colorAttachments[0].pixelFormat = swapChain->currentDrawableTexture().pixelFormat;
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
pd.depthAttachmentPixelFormat = cp_layer_renderer_configuration_get_depth_format(swapChain->m_layerRendererConfiguration);
}
else
#endif // BX_PLATFORM_VISIONOS
{
pd.depthAttachmentPixelFormat = NULL != swapChain->m_backBufferDepth
? swapChain->m_backBufferDepth.m_obj.pixelFormat
@@ -2530,17 +2389,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
: NULL
;
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
if (cp_layer_renderer_configuration_get_layout(m_mainFrameBuffer.m_swapChain->m_layerRendererConfiguration) == cp_layer_renderer_layout_layered)
{
auto properties = cp_layer_renderer_get_properties(m_mainFrameBuffer.m_swapChain->m_layerRenderer);
pd.maxVertexAmplificationCount = cp_layer_renderer_properties_get_view_count(properties);
}
}
#endif // BX_PLATFORM_VISIONOS
VertexDescriptor vertexDesc = m_vertexDescriptor;
reset(vertexDesc);
@@ -2851,11 +2699,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
Resolution m_resolution;
void* m_capture;
uint32_t m_captureSize;
#if BX_PLATFORM_VISIONOS
ar_session_t m_arSession;
ar_world_tracking_provider_t m_worldTracking;
ar_device_anchor_t m_deviceAnchor;
#endif // BX_PLATFORM_VISIONOS
// descriptors
RenderPipelineDescriptor m_renderPipelineDescriptor;
@@ -3540,12 +3383,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
SwapChainMtl::~SwapChainMtl()
{
#if BX_PLATFORM_VISIONOS
MTL_RELEASE(m_layerRenderer, 0);
#else
MTL_RELEASE(m_metalLayer, 2);
MTL_RELEASE(m_drawable, 0);
#endif // BX_PLATFORM_VISIONOS
MTL_RELEASE(m_drawableTexture, 0);
@@ -3554,30 +3393,9 @@ BX_PRAGMA_DIAGNOSTIC_POP();
void SwapChainMtl::init(void* _nwh)
{
#if BX_PLATFORM_VISIONOS
NSObject* nvh = (NSObject*)_nwh;
m_useLayerRenderer = ![nvh isKindOfClass:[CAMetalLayer class]];
if (m_useLayerRenderer)
{
cp_layer_renderer_t layerRenderer = (cp_layer_renderer_t)_nwh;
m_layerRenderer = layerRenderer;
m_layerRendererConfiguration = cp_layer_renderer_get_configuration(m_layerRenderer);
if (cp_layer_renderer_configuration_get_layout(m_layerRendererConfiguration) == cp_layer_renderer_layout_dedicated)
{
BX_WARN(false, "Dedicated layer renderer layout is not supported.");
}
retain(m_layerRendererConfiguration);
retain(m_layerRenderer);
}
else
#endif // BX_PLATFORM_VISIONOS
{
MTL_RELEASE(m_metalLayer, 2);
#if !BX_PLATFORM_VISIONOS
if (NULL != NSClassFromString(@"MTKView") )
{
MTKView *view = (MTKView *)_nwh;
@@ -3588,7 +3406,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
m_metalLayer = (CAMetalLayer *)view.layer;
}
}
#endif // !BX_PLATFORM_VISIONOS
if (NULL != NSClassFromString(@"CAMetalLayer") )
{
@@ -3735,9 +3552,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
# endif // __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
#endif // BX_PLATFORM_OSX
#if BX_PLATFORM_VISIONOS
if (!m_useLayerRenderer)
#endif // BX_PLATFORM_VISIONOS
{
m_metalLayer.drawableSize = CGSizeMake(_width, _height);
m_metalLayer.pixelFormat = (resetFlags & BGFX_RESET_SRGB_BACKBUFFER)
@@ -3772,16 +3586,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
{
const MTLPixelFormat depthFormat = s_textureFormat[formatDepthStencil].m_fmt;
#if BX_PLATFORM_VISIONOS
if (m_useLayerRenderer)
{
if (m_layerRendererDrawable)
{
m_backBufferDepth = cp_drawable_get_depth_texture(m_layerRendererDrawable, 0);
}
}
else
#endif // BX_PLATFORM_VISIONOS
{
desc.pixelFormat = depthFormat;
m_backBufferDepth = s_renderMtl->m_device.newTextureWithDescriptor(desc);
@@ -3818,12 +3622,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
bx::HashMurmur2A murmur;
murmur.begin();
murmur.add(1);
#if BX_PLATFORM_VISIONOS
if (!m_useLayerRenderer)
#endif // !BX_PLATFORM_VISIONOS
{
murmur.add(m_metalLayer.pixelFormat);
}
murmur.add(m_metalLayer.pixelFormat);
murmur.add(formatColor);
murmur.add(formatDepthStencil);
murmur.add(sampleCount);
@@ -3835,46 +3634,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
{
if (NULL == m_drawableTexture)
{
#if BX_PLATFORM_VISIONOS
if (m_useLayerRenderer)
{
m_frame = cp_layer_renderer_query_next_frame(m_layerRenderer);
if (NULL != m_frame)
{
cp_frame_timing_t timing = cp_frame_predict_timing(m_frame);
if (NULL == timing)
{
return NULL;
}
cp_frame_start_update(m_frame);
cp_frame_end_update(m_frame);
cp_time_wait_until(cp_frame_timing_get_optimal_input_time(timing) );
cp_frame_start_submission(m_frame);
m_layerRendererDrawable = cp_frame_query_drawable(m_frame);
}
}
else
#endif // BX_PLATFORM_VISIONOS
{
m_drawable = m_metalLayer.nextDrawable;
}
#if BX_PLATFORM_VISIONOS
if (m_useLayerRenderer)
{
if (m_layerRendererDrawable != NULL)
{
m_drawableTexture = cp_drawable_get_color_texture(m_layerRendererDrawable, 0);
retain(m_drawableTexture);
}
}
else
#endif // BX_PLATFORM_VISIONOS
m_drawable = m_metalLayer.nextDrawable;
if (m_drawable != NULL)
{
@@ -3887,18 +3647,9 @@ BX_PRAGMA_DIAGNOSTIC_POP();
TextureDescriptor desc = newTextureDescriptor();
desc.textureType = MTLTextureType2D;
#if BX_PLATFORM_VISIONOS
if (m_useLayerRenderer)
{
desc.pixelFormat = kMtlPixelFormatBGRA8Unorm_sRGB;
}
else
#endif // BX_PLATFORM_VISIONOS
{
desc.pixelFormat = m_metalLayer.pixelFormat;
desc.width = m_metalLayer.drawableSize.width;
desc.height = m_metalLayer.drawableSize.height;
}
desc.pixelFormat = m_metalLayer.pixelFormat;
desc.width = m_metalLayer.drawableSize.width;
desc.height = m_metalLayer.drawableSize.height;
desc.depth = 1;
desc.mipmapLevelCount = 1;
@@ -4705,19 +4456,6 @@ BX_PRAGMA_DIAGNOSTIC_POP();
rce.setTriangleFillMode(wireframe ? MTLTriangleFillModeLines : MTLTriangleFillModeFill);
#if BX_PLATFORM_VISIONOS
if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer)
{
if (cp_layer_renderer_configuration_get_layout(m_mainFrameBuffer.m_swapChain->m_layerRendererConfiguration) == cp_layer_renderer_layout_layered)
{
MTLViewport viewports[2];
calculateViewPorts(viewports);
rce.setViewports(viewports, 1);
setVertexAmplification(rce);
}
}
else
#endif // BX_PLATFORM_VISIONOS
{
MTLViewport vp;
vp.originX = viewState.m_rect.m_x;