BabylonJS · bghgary · Jan 30, 2026 · Feb 4, 2026 · Feb 5, 2026 · Feb 5, 2026
diff --git a/Apps/Playground/Android/BabylonNative/CMakeLists.txt b/Apps/Playground/Android/BabylonNative/CMakeLists.txt
@@ -38,6 +38,7 @@ target_link_libraries(BabylonNativeJNI
     NativeTracing
     NativeXr
     ScriptLoader
+    ShaderCache
     TestUtils
     Window
     XMLHttpRequest)
diff --git a/Apps/Playground/CMakeLists.txt b/Apps/Playground/CMakeLists.txt
@@ -137,6 +137,7 @@ target_link_libraries(Playground
     PRIVATE NativeInput
     PRIVATE NativeOptimizations
     PRIVATE NativeTracing
+    PRIVATE ShaderCache
     PRIVATE ScriptLoader
     PRIVATE TestUtils
     PRIVATE Window

diff --git a/Apps/Playground/Shared/AppContext.cpp b/Apps/Playground/Shared/AppContext.cpp
@@ -5,7 +5,6 @@
 #include <Babylon/Graphics/Device.h>
 #include <Babylon/PerfTrace.h>
 #include <Babylon/ScriptLoader.h>
-#include <Babylon/ShaderCache.h>
 
 #include <Babylon/Plugins/NativeCamera.h>
 #include <Babylon/Plugins/NativeCapture.h>
@@ -14,6 +13,7 @@
 #include <Babylon/Plugins/NativeInput.h>
 #include <Babylon/Plugins/NativeOptimizations.h>
 #include <Babylon/Plugins/NativeTracing.h>
+#include <Babylon/Plugins/ShaderCache.h>
 #include <Babylon/Plugins/TestUtils.h>
 
 #include <Babylon/Polyfills/Blob.h>
@@ -63,7 +63,7 @@ AppContext::AppContext(
     m_device.emplace(graphicsConfig);
     m_deviceUpdate.emplace(m_device->GetUpdate("update"));
 
-    Babylon::ShaderCache::Enabled(true);
+    Babylon::Plugins::ShaderCache::Enable();
 
     m_device->StartRenderingCurrentFrame();
     m_deviceUpdate->Start();
@@ -142,6 +142,8 @@ AppContext::~AppContext()
         m_device->FinishRenderingCurrentFrame();
     }
 
+    Babylon::Plugins::ShaderCache::Disable();
+
     m_scriptLoader.reset();
     m_canvas.reset();
     m_input = {};

diff --git a/Apps/Playground/Win32/App.cpp b/Apps/Playground/Win32/App.cpp
@@ -77,7 +77,7 @@ namespace
         RECT rect;
         if (!GetClientRect(hWnd, &rect))
         {
-            return;
+            throw std::exception{"Unable to get client rect"};
         }
 
         auto width = static_cast<size_t>(rect.right - rect.left);

diff --git a/Apps/UnitTests/CMakeLists.txt b/Apps/UnitTests/CMakeLists.txt
@@ -12,14 +12,14 @@ set(BABYLONJS_MATERIALS_ASSETS
 
 set(TEST_ASSETS
     "JavaScript/dist/tests.javaScript.all.js"
-    "JavaScript/dist/tests.nativeEngine.shaderCache.js")
+    "JavaScript/dist/tests.shaderCache.basicScene.js")
 
 set(SOURCES
     "Source/App.h"
     "Source/App.cpp"
     "Source/Tests.ExternalTexture.cpp"
     "Source/Tests.JavaScript.cpp"
-    "Source/Tests.NativeEngine.cpp"
+    "Source/Tests.ShaderCache.cpp"
     "Source/Utils.h"
     "Source/Utils.${GRAPHICS_API}.${BABYLON_NATIVE_PLATFORM_IMPL_EXT}")
 
@@ -58,6 +58,7 @@ target_link_libraries(UnitTests
     PRIVATE NativeEngine
     PRIVATE NativeEncoding
     PRIVATE ScriptLoader
+    PRIVATE ShaderCache
     PRIVATE UrlLib
     PRIVATE Window
     PRIVATE XMLHttpRequest

diff --git a/Apps/UnitTests/JavaScript/dist/tests.javaScript.all.js b/Apps/UnitTests/JavaScript/dist/tests.javaScript.all.js
diff --git a/...pt/dist/tests.nativeEngine.shaderCache.js → ...ript/dist/tests.shaderCache.basicScene.js b/...pt/dist/tests.nativeEngine.shaderCache.js → ...ript/dist/tests.shaderCache.basicScene.js
@@ -83,9 +83,9 @@ module.exports = BABYLON;
 var __webpack_exports__ = {};
 // This entry needs to be wrapped in an IIFE because it needs to be isolated against other modules in the chunk.
 (() => {
-/*!***********************************************!*\
-  !*** ./src/tests.nativeEngine.shaderCache.ts ***!
-  \***********************************************/
+/*!*********************************************!*\
+  !*** ./src/tests.shaderCache.basicScene.ts ***!
+  \*********************************************/
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babylonjs_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babylonjs/core */ "@babylonjs/core");
 /* harmony import */ var _babylonjs_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babylonjs_core__WEBPACK_IMPORTED_MODULE_0__);

diff --git a/...ipt/src/tests.nativeEngine.shaderCache.ts → ...cript/src/tests.shaderCache.basicScene.ts b/...ipt/src/tests.nativeEngine.shaderCache.ts → ...cript/src/tests.shaderCache.basicScene.ts
diff --git a/Apps/UnitTests/JavaScript/webpack.config.js b/Apps/UnitTests/JavaScript/webpack.config.js
@@ -7,7 +7,7 @@ module.exports = {
   devtool: false,
   entry: {
     "tests.javaScript.all": './src/tests.javaScript.all.ts',
-    "tests.nativeEngine.shaderCache": './src/tests.nativeEngine.shaderCache.ts',
+    "tests.shaderCache.basicScene": './src/tests.shaderCache.basicScene.ts',
   },
   externals: {
     "@babylonjs/core": "BABYLON",

diff --git a/Apps/UnitTests/Source/Tests.NativeEngine.cpp → Apps/UnitTests/Source/Tests.ShaderCache.cpp b/Apps/UnitTests/Source/Tests.NativeEngine.cpp → Apps/UnitTests/Source/Tests.ShaderCache.cpp
@@ -5,8 +5,8 @@
 #include <Babylon/Polyfills/Console.h>
 #include <Babylon/Polyfills/Window.h>
 #include <Babylon/Plugins/NativeEngine.h>
+#include <Babylon/Plugins/ShaderCache.h>
 #include <Babylon/ScriptLoader.h>
-#include <Babylon/ShaderCache.h>
 
 #include <chrono>
 #include <optional>
@@ -18,9 +18,9 @@ using namespace std::chrono_literals;
 
 extern Babylon::Graphics::Configuration g_deviceConfig;
 
-TEST(NativeEngine, ShaderCache)
+TEST(ShaderCache, SaveAndLoad)
 {
-    Babylon::ShaderCache::Enabled(true);
+    Babylon::Plugins::ShaderCache::Enable();
 
     Babylon::Graphics::Device device{g_deviceConfig};
     Babylon::Graphics::DeviceUpdate update{device.GetUpdate("update")};
@@ -61,7 +61,7 @@ TEST(NativeEngine, ShaderCache)
 
     Babylon::ScriptLoader loader{runtime};
     loader.LoadScript("app:///Assets/babylon.max.js");
-    loader.LoadScript("app:///Assets/tests.nativeEngine.shaderCache.js");
+    loader.LoadScript("app:///Assets/tests.shaderCache.basicScene.js");
     loader.Dispatch([&scriptIsDone](Napi::Env) {
         scriptIsDone.set_value();
     });
@@ -80,16 +80,18 @@ TEST(NativeEngine, ShaderCache)
     static const char* shaderCacheFileName = "shaderCache.bin";
     uint32_t shaderCount{};
     {
-        std::ofstream fileSerialize(shaderCacheFileName, std::ios::binary);
-        shaderCount = Babylon::ShaderCache::Serialize(fileSerialize);
+        std::ofstream stream(shaderCacheFileName, std::ios::binary);
+        shaderCount = Babylon::Plugins::ShaderCache::Save(stream);
         EXPECT_EQ(shaderCount, 1);
     }
     {
-        std::ifstream file(shaderCacheFileName, std::ios::binary);
-        auto deserializedCount = Babylon::ShaderCache::Deserialize(file);
+        std::ifstream stream(shaderCacheFileName, std::ios::binary);
+        auto deserializedCount = Babylon::Plugins::ShaderCache::Load(stream);
         EXPECT_EQ(deserializedCount, shaderCount);
     }
 
     update.Finish();
     device.FinishRenderingCurrentFrame();
+
+    Babylon::Plugins::ShaderCache::Disable();
 }
diff --git a/Apps/package-lock.json b/Apps/package-lock.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,6 +121,9 @@ option(BABYLON_NATIVE_PLUGIN_NATIVEINPUT "Include Babylon Native Plugin NativeIn
 option(BABYLON_NATIVE_PLUGIN_NATIVEOPTIMIZATIONS "Include Babylon Native Plugin NativeOptimizations." ON)
 option(BABYLON_NATIVE_PLUGIN_NATIVETRACING "Include Babylon Native Plugin NativeTracing." ON)
 option(BABYLON_NATIVE_PLUGIN_NATIVEXR "Include Babylon Native Plugin XR." ON)
+option(BABYLON_NATIVE_PLUGIN_SHADERCACHE "Include Babylon Native Plugin ShaderCache." ON)
+option(BABYLON_NATIVE_PLUGIN_SHADERCOMPILER "Include Babylon Native Plugin ShaderCompiler." ON)
+option(BABYLON_NATIVE_PLUGIN_SHADERTOOL "Include Babylon Native Plugin ShaderTool." ON)
 option(BABYLON_NATIVE_PLUGIN_TESTUTILS "Include Babylon Native Plugin TestUtils." ON)
 
 # Polyfills

diff --git a/Core/Graphics/CMakeLists.txt b/Core/Graphics/CMakeLists.txt
@@ -26,7 +26,7 @@ target_include_directories(Graphics
     PRIVATE "Include/Shared"
     PRIVATE "Include/Platform/${BABYLON_NATIVE_PLATFORM}"
     PRIVATE "Include/RendererType/${GRAPHICS_API}"
-    PRIVATE "InternalInclude/Babylon/Graphics")
+    PRIVATE "InternalInclude")
 
 if(WINDOWS_STORE)
     target_link_libraries(Graphics

diff --git a/Core/Graphics/InternalInclude/Babylon/Graphics/BgfxShaderInfo.h b/Core/Graphics/InternalInclude/Babylon/Graphics/BgfxShaderInfo.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <map>
+#include <vector>
+
+namespace Babylon::Graphics
+{
+    struct BgfxShaderInfo
+    {
+        std::vector<uint8_t> VertexBytes{};
+        std::vector<uint8_t> FragmentBytes{};
+        std::map<std::string, uint32_t> VertexAttributeLocations{};
+        std::map<std::string, uint8_t> UniformStages{};
+    };
+}
diff --git a/Core/Graphics/Source/BgfxCallback.cpp b/Core/Graphics/Source/BgfxCallback.cpp
@@ -1,11 +1,9 @@
-#include "BgfxCallback.h"
+#include <Babylon/Graphics/BgfxCallback.h>
+#include <bgfx/bgfx.h>
 #include <bx/bx.h>
 #include <bx/string.h>
-#include <bx/platform.h>
-#include <bx/debug.h>
-#include <stdarg.h>
-#include <bgfx/bgfx.h>
 #include <cassert>
+#include <stdarg.h>
 
 namespace Babylon::Graphics
 {

diff --git a/Core/Graphics/Source/DeviceContext.cpp b/Core/Graphics/Source/DeviceContext.cpp
@@ -1,4 +1,4 @@
-#include "DeviceContext.h"
+#include <Babylon/Graphics/DeviceContext.h>
 
 #include "DeviceImpl.h"
 

diff --git a/Core/Graphics/Source/DeviceImpl.h b/Core/Graphics/Source/DeviceImpl.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "BgfxCallback.h"
-#include "SafeTimespanGuarantor.h"
-#include "DeviceContext.h"
-
+#include <Babylon/Graphics/BgfxCallback.h>
 #include <Babylon/Graphics/Device.h>
+#include <Babylon/Graphics/DeviceContext.h>
+#include <Babylon/Graphics/SafeTimespanGuarantor.h>
 
 #include <arcana/containers/ticketed_collection.h>
 #include <arcana/threading/blocking_concurrent_queue.h>

diff --git a/Core/Graphics/Source/FrameBuffer.cpp b/Core/Graphics/Source/FrameBuffer.cpp
@@ -1,4 +1,4 @@
-#include "FrameBuffer.h"
+#include <Babylon/Graphics/FrameBuffer.h>
 #include "DeviceImpl.h"
 #include <arcana/macros.h>
 #include <cmath>

diff --git a/Core/Graphics/Source/SafeTimespanGuarantor.cpp b/Core/Graphics/Source/SafeTimespanGuarantor.cpp
@@ -1,4 +1,4 @@
-#include "SafeTimespanGuarantor.h"
+#include <Babylon/Graphics/SafeTimespanGuarantor.h>
 
 namespace Babylon::Graphics
 {

diff --git a/Core/Graphics/Source/Texture.cpp b/Core/Graphics/Source/Texture.cpp
@@ -1,5 +1,5 @@
-#include "Texture.h"
-#include "DeviceContext.h"
+#include <Babylon/Graphics/Texture.h>
+#include <Babylon/Graphics/DeviceContext.h>
 #include <cassert>
 #include <bimg/bimg.h>
 

diff --git a/Install/Install.cmake b/Install/Install.cmake
@@ -170,6 +170,15 @@ if(TARGET NativeEncoding)
     install_include_for_targets(NativeEncoding)
 endif()
 
+if(TARGET ShaderCache)
+    install_targets(ShaderCache)
+    install_include_for_targets(ShaderCache)
+endif()
+
+if(TARGET ShaderCompiler)
+    install_targets(ShaderCompiler)
+endif()
+
 # ----------------
 # Polyfills
 # ----------------

diff --git a/Install/Test/CMakeLists.txt b/Install/Test/CMakeLists.txt
@@ -40,15 +40,16 @@ set(NAPI_JAVASCRIPT_ENGINE "Chakra")
 if(WIN32 AND NOT WINDOWS_STORE)
     set(SOURCE_DIR "../../Apps/UnitTests/Source")
     set(SOURCES
-        "${SOURCE_DIR}/App.h"
         "${SOURCE_DIR}/App.cpp"
+        "${SOURCE_DIR}/App.h"
         "${SOURCE_DIR}/App.Win32.cpp"
-        "${SOURCE_DIR}/Tests.JavaScript.cpp"
-        "${SOURCE_DIR}/Tests.NativeEngine.cpp"
+        "${SOURCE_DIR}/Tests.Device.D3D11.cpp"
         "${SOURCE_DIR}/Tests.ExternalTexture.cpp"
         "${SOURCE_DIR}/Tests.ExternalTexture.D3D11.cpp"
-        "${SOURCE_DIR}/Utils.h"
-        "${SOURCE_DIR}/Utils.D3D11.cpp")
+        "${SOURCE_DIR}/Tests.JavaScript.cpp"
+        "${SOURCE_DIR}/Tests.ShaderCache.cpp"
+        "${SOURCE_DIR}/Utils.D3D11.cpp"
+        "${SOURCE_DIR}/Utils.h")
 else()
     message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
 endif()
@@ -76,6 +77,7 @@ target_link_libraries(TestInstall
     ${INSTALL_LIB_NAMES}
     gtest_main
     chakrart
+    d3d11
     d3dcompiler
     onecore)
 

diff --git a/NOTICE.md b/NOTICE.md
@@ -2258,4 +2258,41 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-```
+```
+
+# xxHash
+
+```
+xxHash - Extremely Fast Hash algorithm
+Header File
+Copyright (C) 2012-2023 Yann Collet
+
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+You can contact the author at:
+  - xxHash homepage: https://www.xxhash.com
+  - xxHash source repository: https://github.com/Cyan4973/xxHash
+```