Skip to content

Add native cube render target support (re-enables 2 shadow-with-instances tests) #1750

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.

Sign up for GitHub

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

Draft
bkaradzic-microsoft wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −6
Draft

Add native cube render target support (re-enables 2 shadow-with-instances tests) #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions Apps/Playground/Scripts/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,16 +1823,12 @@
"title": "Shadows with instances in left handed system",
"playgroundId": "#MSAHKR#79",
"renderCount": 10,
"excludeFromAutomaticTesting": true,
"reason": "Test crashes or hangs on Babylon Native",
"referenceImage": "shadowsinstancesleft.png"
},
{
"title": "Shadows with instances in right handed system",
"playgroundId": "#MSAHKR#13",
"renderCount": 10,
"excludeFromAutomaticTesting": true,
"reason": "Test crashes or hangs on Babylon Native",
"referenceImage": "shadowsinstancesright.png"
},
{
Expand Down
15 changes: 13 additions & 2 deletions Plugins/NativeEngine/Source/NativeEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,7 @@ namespace Babylon
const bool renderTarget = info[5].As<Napi::Boolean>();
const bool srgb = info[6].As<Napi::Boolean>();
const uint32_t samples = info[7].IsUndefined() ? 1 : info[7].As<Napi::Number>().Uint32Value();
const bool isCube = info.Length() > 8 && !info[8].IsUndefined() && info[8].As<Napi::Boolean>();

auto flags = BGFX_TEXTURE_NONE;
if (renderTarget)
Expand All @@ -1359,7 +1360,15 @@ namespace Babylon
flags |= BGFX_TEXTURE_SRGB;
}

texture->Create2D(width, height, hasMips, 1, format, flags);
if (isCube)
{
// Cube render target: width is the per-face size.
texture->CreateCube(width, hasMips, 1, format, flags);
}
else
{
texture->Create2D(width, height, hasMips, 1, format, flags);
}
}

void NativeEngine::LoadTexture(const Napi::CallbackInfo& info)
Expand Down Expand Up @@ -1852,6 +1861,8 @@ namespace Babylon
const bool generateStencilBuffer = info[3].As<Napi::Boolean>();
const bool generateDepth = info[4].As<Napi::Boolean>();
const uint32_t samples = info[5].IsUndefined() ? 1 : info[5].As<Napi::Number>().Uint32Value();
// Optional cube-face / array layer for the color attachment (single-face cube render targets).
const uint16_t layer = (info.Length() > 6 && !info[6].IsUndefined()) ? static_cast<uint16_t>(info[6].As<Napi::Number>().Uint32Value()) : 0;

std::array<bgfx::Attachment, 2> attachments{};
uint8_t numAttachments = 0;
Expand All @@ -1862,7 +1873,7 @@ namespace Babylon
// bgfx validation now asserts when trying to use BGFX_RESOLVE_AUTO_GEN_MIPS with a texture that doesn't have the BGFX_CAPS_FORMAT_TEXTURE_MIP_AUTOGEN flag,
// but before it would just ignore the flag and not generate mips without any warning. This prevents validation assert, but rendering might be broken if autogen
// mips were expected. Basically this change preserves previous behavior.
attachments[numAttachments++].init(texture->Handle(), bgfx::Access::Write, 0, 1, 0
attachments[numAttachments++].init(texture->Handle(), bgfx::Access::Write, layer, 1, 0
, 0 != (caps->formats[texture->Format()] & BGFX_CAPS_FORMAT_TEXTURE_MIP_AUTOGEN) ? BGFX_RESOLVE_AUTO_GEN_MIPS : BGFX_RESOLVE_NONE
);
}
Expand Down
Loading