Skip to content

HLSL: expose remaining stubs needed by Babylon Native shaders#11

Merged
bkaradzic-microsoft merged 1 commit into
mainfrom
expose-remaining-hlsl-stubs
May 15, 2026
Merged

HLSL: expose remaining stubs needed by Babylon Native shaders#11
bkaradzic-microsoft merged 1 commit into
mainfrom
expose-remaining-hlsl-stubs

Conversation

@bkaradzic-microsoft

Copy link
Copy Markdown
Member

Continues the work in #6-#10.

Removes WEBMIN guards around four opcodes/helpers that Babylon Native's shader compiler still trips on after #10:

Site Function Tests fixed
case OpSNegate CompilerGLSL_emit_instruction 26
case OpVectorTimesMatrix (x2 sites) emit_instruction and CompilerGLSL_emit_instruction 1
case OpVectorExtractDynamic CompilerGLSL_emit_instruction 1
to_extract_constant_composite_expression() helper 1

For to_extract_constant_composite_expression the WEBMIN-OFF branch already contains the real implementation in this same file; the patch replaces the WEBMIN-ON SPIRV_CROSS_INVALID_CALL() stub with that same body so the helper is always available. The other four sites collapse a #ifndef SPIRV_CROSS_WEBMIN ... #else SPIRV_CROSS_INVALID_CALL(); #endif block to keep the implementation unconditionally.

Net change: +35 / -20 lines.

Validation

Built BabylonNative/Apps/Playground Release x64 against this branch and re-ran the 46 disabled visual tests that were known to hit the SPIRV-Cross WEBMIN stubs:

After #10 After this PR
PASS 9 19
FAIL_PIXEL_DIFF 5 18
HANG / shader-compile error 31 0
JS_ERROR / TIMEOUT (non-SPIRV-Cross) 1 9

After this patch, no failing test still hits a spirv_hlsl.cpp assert. Remaining failures are downstream Babylon Native bugs (pixel diffs, JS-side errors, asset-load issues) that were previously masked by the SPIRV-Cross hang.

I verified equivalence between this surgical 5-block patch and a "remove all 162 WEBMIN guards" patch — both produce the same 19 PASS / 18 PD / 7 JS / 2 TIMEOUT split, confirming these are the only sites reachable by the failing tests.

Continues the work in #6-#10. Removes WEBMIN guards around four
opcodes/helpers that Babylon Native's shader compiler trips on:

  - OpSNegate (case in CompilerGLSL_emit_instruction)
  - OpVectorTimesMatrix (cases in emit_instruction and
    CompilerGLSL_emit_instruction)
  - OpVectorExtractDynamic (case in CompilerGLSL_emit_instruction)
  - to_extract_constant_composite_expression() helper (replaces
    INVALID_CALL stub with the real implementation already present
    in the same file)

These were the only remaining SPIRV-Cross stubs reachable by Babylon
Native's HLSL transpile path on D3D11. Net change: +35 / -20 lines.
@bkaradzic-microsoft bkaradzic-microsoft merged commit 866e5ed into main May 15, 2026
bkaradzic-microsoft pushed a commit to bkaradzic-microsoft/BabylonNative that referenced this pull request May 15, 2026
Picks up BabylonJS/SPIRV-Cross#11 which un-guards the final HLSL stubs
that Babylon Native's shader compiler still tripped on after BabylonJS#10:

  - OpSNegate
  - OpVectorTimesMatrix (two sites)
  - OpVectorExtractDynamic
  - to_extract_constant_composite_expression() helper

These were the only remaining SPIRV-Cross WEBMIN stubs reachable by
Babylon Native's HLSL transpile path on D3D11.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
bkaradzic-microsoft pushed a commit to bkaradzic-microsoft/BabylonNative that referenced this pull request May 15, 2026
Picks up BabylonJS/SPIRV-Cross#11 which un-guards the final HLSL stubs
that Babylon Native's shader compiler still tripped on after BabylonJS#10:

  - OpSNegate
  - OpVectorTimesMatrix (two sites)
  - OpVectorExtractDynamic
  - to_extract_constant_composite_expression() helper

These were the only remaining SPIRV-Cross WEBMIN stubs reachable by
Babylon Native's HLSL transpile path on D3D11.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
bkaradzic-microsoft added a commit to BabylonJS/BabylonNative that referenced this pull request May 15, 2026
## Summary

Bumps `BabylonJS/SPIRV-Cross` to
[`866e5ed`](BabylonJS/SPIRV-Cross@866e5ed),
the merge of
[BabylonJS/SPIRV-Cross#11](BabylonJS/SPIRV-Cross#11)
on top of
[BabylonJS/SPIRV-Cross#10](BabylonJS/SPIRV-Cross#10)
("Expose more functions"). Together these remove `#ifndef
SPIRV_CROSS_WEBMIN` guards and their `SPIRV_CROSS_INVALID_CALL()` (=
`assert(false)`) stub bodies for the HLSL opcodes / helpers reachable
from the BN test catalog: `OpFMod`, `OpLogicalOr`, `OpLogicalAnd`,
`OpFwidthFine`, `OpVectorTimesMatrix` (×2 sites),
`OpVectorExtractDynamic`, `OpSNegate`, plus
`to_extract_constant_composite_expression`. Previously-stubbed opcodes
now emit the actual HLSL instead of crashing or returning invalid shader
code.

Also re-enables 17 `validation_native.js` tests in
`Apps/Playground/Scripts/config.json` that were previously excluded with
`"reason": "Test crashes or hangs on Babylon Native"` and now pass on
Win32 D3D11:

idx 138, 241, 254, 293, 296, 309, 321, 322, 323, 332, 333, 373, 376,
391, 558, 559, 574.

## Note on remaining failures unmasked by the bump

In Release builds `SPIRV_CROSS_INVALID_CALL()` is a no-op, so
SPIRV-Cross was silently emitting invalid shader code and the test
pipeline appeared to hang waiting for a render. After this bump, the
underlying JS-side errors are now visible. Several still-failing tests
turn out to have causes unrelated to SPIRV-Cross:

1. The 26 Prepass SSAO + motion blur tests fail at the JS layer with
`PrePassRenderer needs WebGL 2 support` **before** any shader compile —
`NativeEngine` does not advertise the WebGL2 capability that
`PrePassRenderer` requires.
2. One GPU-particles test (`GPU Particles - Animations`) now fails with
`TypeError: Unable to get property 'ARRAY_BUFFER' of undefined` — same
root cause as the GPU-particle `ARRAY_BUFFER` bug previously identified.
3. Two tests (`GreasedLine`, `Area Lights Standard Material`) fail to
load LTC LUT textures: `Error: Unknown error opening URL` — UrlLib /
asset resolution issue.
4. Three OpenPBR variants (Fuzz Weight, Transmission Dispersion — the
`Realtime IBL` / `Prefiltered IBL` paths) still hit shader-compile
errors — likely additional `SPIRV_CROSS_INVALID_CALL()` stub sites not
yet reached by this bump.

These will be tracked as separate follow-up work (renderer-side WebGL2
capability, GPU-particle gl-constants binding, UrlLib LTC asset path,
and a further SPIRV-Cross pass once a `Debug` build pinpoints the
remaining stub sites).

## OpenGL backend coverage

A local `OpenGLWindowsDevOnly` build (Windows + ANGLE, same
`STRINGIZE(GRAPHICS_API) == "OpenGL"` as Linux native OpenGL) was used
to validate the re-enabled tests against the OpenGL backend. Four
entries diverge on OpenGL only and have been marked
`"excludedGraphicsApis": ["OpenGL"]` with a documented reason:

- idx 293, 296: `BGFX FATAL` `mediump float`→`int` shader-compile error
in the `PrePassRenderer` fragment shader (OpenGL/ANGLE GLSL only).
- idx 391: 90 900-px diff in
`sphere-with-custom-shader-to-display-wireframe-using-glow-layer`
(glow-layer + custom-shader divergence).

idx 299 (`Prepass SSAO + GUI`) is held out of the re-enable batch
entirely (kept `excludeFromAutomaticTesting: true`): it passes in
isolation but produces a ~6000-px diff right at the 2.5 % `errorRatio`
threshold when run after sibling Prepass-SSAO tests in the full sweep —
flaky on Win32 D3D11 in CI.

## Build hygiene fix

The pre-existing `OpenGLWindowsDevOnly` build was broken under MSVC
`/WX` because `ExternalTexture_Shared.h` lines 25/28 trip C4702
(unreachable code) — the OpenGL impl's `GetInfo` / `Set` / `Get` always
throw, so the dispatch's no-throw fall-through is statically
unreachable. Added `target_compile_options(ExternalTexture PRIVATE
/wd4702)` gated on `GRAPHICS_API STREQUAL "OpenGL" AND MSVC` in
`Plugins/ExternalTexture/CMakeLists.txt`. No other build is affected.
The right long-term fix is to make the throws conditional in the OpenGL
impl.

## Verification

- Win32 D3D11 (Release x64, Chakra), Windows ANGLE OpenGL
(`OpenGLWindowsDevOnly`), and Linux native OpenGL all run the full sweep
cleanly with the bump applied.
- Re-fetched `_deps/spirv-cross-src` matches the merged `866e5ed`
byte-for-byte.

## Notes

- This only bumps the standalone SPIRV-Cross used by
`Plugins/ShaderCompiler/Source/ShaderCompilerDXBC.cpp` (the one declared
in `CMakeLists.txt`). The bgfx-bundled SPIRV-Cross under
`_deps/bgfx.cmake-src/3rdparty/spirv-cross/` is unaffected.
- Upstream `BabylonJS/SPIRV-Cross` is now 2 commits ahead of the
previous pin (PR #10 + PR #11).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Branimir Karadzic <branimirkaradzic@gmail.com>
bkaradzic-microsoft added a commit that referenced this pull request May 28, 2026
Replace WEBMIN stubs for CompilerHLSL::image_type_hlsl and
CompilerHLSL::image_type_hlsl_legacy with their real implementations
(copied from the WEBMIN-OFF branch). These two functions are called
when emitting HLSL Texture/Sampler declarations and were previously
throwing 'Invalid call.' under SPIRV_CROSS_WEBMIN, which broke
Babylon Native shader compilation for any test that bound a sampled
image (e.g. Babylon.js 'Area Lights - PBR' which uses sampler2D
parameters in LTC code path).

Continues the same un-guarding pattern as PR #11.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant