Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Sync bgfx master (visionOS build issue) #41

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Sync bgfx master (visionOS build issue) #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff1fa8d
Use the correct options enum when checking D3D12 features. (#3346)
kalmard0 Aug 28, 2024
ed03259
fix: visionOS 1.2 build errors (#3347)
okwasniewski Aug 28, 2024
97d618b
Merge branch 'master' into babylon-master
okwasniewski Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/renderer_d3d12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@ namespace bgfx { namespace d3d12
break;
}

for (D3D12_FEATURE_DATA_D3D12_OPTIONS13 options13; SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS12, &options13, sizeof(options13)));)
for (D3D12_FEATURE_DATA_D3D12_OPTIONS13 options13; SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS13, &options13, sizeof(options13)));)
{
BX_TRACE("D3D12 options 13:");
BX_TRACE("\tUnrestrictedBufferTextureCopyPitchSupported %d", options13.UnrestrictedBufferTextureCopyPitchSupported);
Expand All @@ -1125,7 +1125,7 @@ namespace bgfx { namespace d3d12
break;
}

for (D3D12_FEATURE_DATA_D3D12_OPTIONS14 options14; SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS12, &options14, sizeof(options14)));)
for (D3D12_FEATURE_DATA_D3D12_OPTIONS14 options14; SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS14, &options14, sizeof(options14)));)
{
BX_TRACE("D3D12 options 14:");
BX_TRACE("\tAdvancedTextureOpsSupported %d", options14.AdvancedTextureOpsSupported);
Expand All @@ -1134,7 +1134,7 @@ namespace bgfx { namespace d3d12
break;
}

for (D3D12_FEATURE_DATA_D3D12_OPTIONS15 options15; SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS12, &options15, sizeof(options15)));)
for (D3D12_FEATURE_DATA_D3D12_OPTIONS15 options15; SUCCEEDED(m_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS15, &options15, sizeof(options15)));)
{
BX_TRACE("D3D12 options 15:");
BX_TRACE("\tTriangleFanSupported %d", options15.TriangleFanSupported);
Expand Down
2 changes: 2 additions & 0 deletions src/renderer_mtl.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3523,6 +3523,7 @@ void writeString(bx::WriterI* _writer, const char* _str)
release(m_metalLayer);
}

#if !BX_PLATFORM_VISIONOS
if (NULL != NSClassFromString(@"MTKView") )
{
MTKView *view = (MTKView *)_nwh;
Expand All @@ -3533,6 +3534,7 @@ void writeString(bx::WriterI* _writer, const char* _str)
m_metalLayer = (CAMetalLayer *)view.layer;
}
}
#endif

if (NULL != NSClassFromString(@"CAMetalLayer") )
{
Expand Down