Canvas plugin

.github/jobs/test_install_win32.yml

@@ -41,7 +41,6 @@ jobs:
 
       # BGFX_CONFIG_MAX_FRAME_BUFFERS is set so enough Framebuffers are available before V8 starts disposing unused ones
       - script: |
-          # BGFX_CONFIG_MAX_FRAME_BUFFERS is set so enough Framebuffers are available before V8 starts disposing unused ones
           cmake -G "Visual Studio 17 2022" -B build${{ variables.solutionName }} -A ${{ parameters.platform }} ${{ variables.jsEngineDefine }} -D BX_CONFIG_DEBUG=ON -D GRAPHICS_API=${{ parameters.graphics_api }} -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BGFX_CONFIG_MAX_FRAME_BUFFERS=256 -D BABYLON_DEBUG_TRACE=ON
         displayName: 'Generate ${{ variables.solutionName }} solution'
 

Apps/Playground/Scripts/config.json

@@ -1,6 +1,13 @@
 {
     "root": "https://cdn.babylonjs.com",
     "tests": [
+        {
+            "title": "Native Canvas",
+            "playgroundId": "#TKVFSA#2",
+            "referenceImage": "native-canvas.png",
+            "excludedGraphicsApis": [ "D3D12" ],
+            "comment": "2D Path not rendered with D3D12"
+        },
         {
             "title": "EXR Loader",
             "playgroundId": "#4RN0VF#151",
@@ -129,7 +136,7 @@
             "title": "Dynamic Texture context clip",
             "playgroundId": "#FU0ES5#47",
             "referenceImage": "dynamicTextureClip.png",
-            "excludedGraphicsApis": ["D3D12" ],
+            "excludedGraphicsApis": [ "D3D12" ],
             "comment": "D3D12/CI: Incorrect rendering of clipped texture"
         },
         {

Plugins/NativeEngine/CMakeLists.txt

@@ -35,21 +35,41 @@ target_include_directories(NativeEngine
     PUBLIC "Include"
     PRIVATE "${BIMG_DIR}/3rdparty")
 
-target_link_libraries(NativeEngine
-    PUBLIC napi
-    PRIVATE arcana
-    PRIVATE bgfx
-    PRIVATE bimg
-    PRIVATE bimg_encode
-    PRIVATE bimg_decode
-    PRIVATE bx
-    PRIVATE minz
-    PRIVATE glslang
-    PRIVATE glslang-default-resource-limits
-    PRIVATE GraphicsDevice
-    PRIVATE GraphicsDeviceContext
-    PRIVATE JsRuntime
-    PRIVATE SPIRV)
+if(BGFX_BUILD_TOOLS)
+    target_link_libraries(NativeEngine
+        PUBLIC napi
+        PRIVATE JsRuntime
+        PRIVATE GraphicsDevice
+        PRIVATE arcana
+        PRIVATE bgfx
+        PRIVATE bimg
+        PRIVATE bimg_encode
+        PRIVATE bimg_decode
+        PRIVATE bx
+        PRIVATE minz
+        PRIVATE glslang
+        PRIVATE spirv-opt
+        PRIVATE GraphicsDeviceContext)
+    target_compile_definitions(NativeEngine PRIVATE BGFX_BUILD_TOOLS)
+else()
+    target_link_libraries(NativeEngine
+        PUBLIC napi
+        PRIVATE arcana
+        PRIVATE bgfx
+        PRIVATE bimg
+        PRIVATE bimg_encode
+        PRIVATE bimg_decode
+        PRIVATE bx
+        PRIVATE minz
+        PRIVATE glslang
+        PRIVATE glslang-default-resource-limits
+        PRIVATE GraphicsDevice
+        PRIVATE GraphicsDeviceContext
+        PRIVATE JsRuntime
+        PRIVATE SPIRV)
+
+    warnings_as_errors(NativeEngine)
+endif()
 
 if(BABYLON_NATIVE_PLUGIN_NATIVEENGINE_WEBP)
     target_compile_definitions(NativeEngine

Plugins/NativeEngine/Source/ShaderCompilerMetal.cpp

@@ -5,6 +5,7 @@
 #include <bgfx/bgfx.h>
 #include <glslang/Public/ShaderLang.h>
 #include <glslang/Public/ResourceLimits.h>
+#include <glslang/MachineIndependent/localintermediate.h>
 #include <SPIRV/GlslangToSpv.h>
 #include <spirv_parser.hpp>
 #include <spirv_msl.hpp>

Plugins/NativeEngine/Source/ShaderCompilerTraversers.cpp

@@ -220,8 +220,11 @@ namespace Babylon::ShaderCompilerTraversers
                 // Create the symbol for the actual struct. The name of this symbol, "anon@0",
                 // mirrors the kinds of strings glslang generates automatically for these sorts
                 // of objects.
-                TIntermSymbol* structSymbol = intermediate->addSymbol(TIntermSymbol{ids.Next(), "anon@0", structType});
-
+#ifdef BGFX_BUILD_TOOLS
+                TIntermSymbol* structSymbol = intermediate->addSymbol(TIntermSymbol{ids.Next(), "anon@0", intermediate->getStage(), structType});
+#else
+                TIntermSymbol* structSymbol = intermediate->addSymbol(TIntermSymbol{ ids.Next(), "anon@0", structType });
+#endif
                 // Every affected symbol in the AST (except linker objects) must be replaced
                 // with a new operation to retrieve its value from the struct. This operation
                 // consists of a binary operation indexing into the struct at a specified
@@ -521,7 +524,11 @@ namespace Babylon::ShaderCompilerTraversers
 
                 TType newType{publicType};
                 newType.setBasicType(symbol->getType().getBasicType());
-                auto* newSymbol = intermediate->addSymbol(TIntermSymbol{ids.Next(), newName, newType});
+#ifdef BGFX_BUILD_TOOLS
+                auto* newSymbol = intermediate->addSymbol(TIntermSymbol{ids.Next(), newName, intermediate->getStage(), newType});
+#else
+                auto* newSymbol = intermediate->addSymbol(TIntermSymbol{ ids.Next(), newName, newType });
+#endif
                 originalNameToReplacement[name] = newSymbol;
                 replacementToOriginalName[newName] = name;
             }
@@ -794,7 +801,11 @@ namespace Babylon::ShaderCompilerTraversers
 
                         TType newType{publicType};
                         std::string newName = name + "Texture";
-                        newTexture = intermediate->addSymbol(TIntermSymbol{ids.Next(), newName.c_str(), newType});
+#ifdef BGFX_BUILD_TOOLS
+                        newTexture = intermediate->addSymbol(TIntermSymbol{ids.Next(), newName.c_str(), intermediate->getStage(), newType});
+#else
+                        newTexture = intermediate->addSymbol(TIntermSymbol{ ids.Next(), newName.c_str(), newType });
+#endif
                     }
 
                     // Create the new sampler symbol.
@@ -809,7 +820,11 @@ namespace Babylon::ShaderCompilerTraversers
                         publicType.sampler.sampler = true;
 
                         TType newType{publicType};
-                        newSampler = intermediate->addSymbol(TIntermSymbol{ids.Next(), name.c_str(), newType});
+#ifdef BGFX_BUILD_TOOLS
+                        newSampler = intermediate->addSymbol(TIntermSymbol{ids.Next(), name.c_str(), intermediate->getStage(), newType});
+#else
+                        newSampler = intermediate->addSymbol(TIntermSymbol{ ids.Next(), name.c_str(), newType });
+#endif
                     }
 
                     nameToNewTextureAndSampler[name] = std::pair<TIntermSymbol*, TIntermSymbol*>{newTexture, newSampler};

Polyfills/Canvas/CMakeLists.txt

@@ -18,27 +18,29 @@ function(add_bgfx_shader FILE FOLDER)
         set(OUTPUTS_PRETTY "")
 
         # dx11
-        set(DX11_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Source/Shaders/dx11/${FILENAME}.h)
-        if(NOT "${TYPE}" STREQUAL "COMPUTE")
-            _bgfx_shaderc_parse(
-                DX11 ${COMMON} WINDOWS
-                PROFILE s_5_0
-                O 3
-                OUTPUT ${DX11_OUTPUT}
-                BIN2C "${FILENAME}_dx11"
-            )
-        else()
-            _bgfx_shaderc_parse(
-                DX11 ${COMMON} WINDOWS
-                PROFILE s_5_0
-                O 1
-                OUTPUT ${DX11_OUTPUT}
-                BIN2C "${FILENAME}_dx11"
-            )
+        if(WIN32)
+            set(DX11_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Source/Shaders/dx11/${FILENAME}.h)
+            if(NOT "${TYPE}" STREQUAL "COMPUTE")
+                _bgfx_shaderc_parse(
+                    DX11 ${COMMON} WINDOWS
+                    PROFILE s_5_0
+                    O 3
+                    OUTPUT ${DX11_OUTPUT}
+                    BIN2C "${FILENAME}_dx11"
+                )
+            else()
+                _bgfx_shaderc_parse(
+                    DX11 ${COMMON} WINDOWS
+                    PROFILE s_5_0
+                    O 1
+                    OUTPUT ${DX11_OUTPUT}
+                    BIN2C "${FILENAME}_dx11"
+                )
+            endif()
+            list(APPEND OUTPUTS "DX11")
+            set(OUTPUTS_PRETTY "${OUTPUTS_PRETTY}DX11, ")
         endif()
-        list(APPEND OUTPUTS "DX11")
-        set(OUTPUTS_PRETTY "${OUTPUTS_PRETTY}DX11, ")
-
+
         # metal
         set(METAL_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Source/Shaders/metal/${FILENAME}.h)
         _bgfx_shaderc_parse(METAL ${COMMON} OSX PROFILE metal OUTPUT ${METAL_OUTPUT} BIN2C "${FILENAME}_mtl")
@@ -93,32 +95,40 @@ set(SOURCES
     "Source/Canvas.cpp"
     "Source/Canvas.h"
     "Source/Colors.h"
+    "Source/FrameBufferPool.cpp"
+    "Source/FrameBufferPool.h"
     "Source/Image.cpp"
     "Source/Image.h"
     "Source/ImageData.cpp"
     "Source/ImageData.h"
+    "Source/Path2D.cpp"
+    "Source/Path2D.h"
+    "Source/LineCaps.h"
     "Source/Context.cpp"
     "Source/Context.h"
     "Source/MeasureText.cpp"
     "Source/MeasureText.h"
-    "Source/nanovg_babylon.cpp"
-    "Source/nanovg_babylon.h"
+    "Source/Gradient.cpp"
+    "Source/Gradient.h"
+    "Source/Font.cpp"
+    "Source/Font.h"
+    "Source/nanosvg.h"
+    "Source/nanovg/nanovg.cpp"
+    "Source/nanovg/nanovg.h"
+    "Source/nanovg/nanovg_babylon.cpp"
+    "Source/nanovg/nanovg_babylon.h"
+    "Source/nanovg/nanovg_filterstack.cpp"
+    "Source/nanovg/nanovg_filterstack.h"
     )
 
 file(GLOB SHADERS "Source/Shaders/*.sc" "Source/Shaders/*.sh")
 
-file(GLOB FONT_SOURCES ${BGFX_DIR}/examples/common/font/*.cpp)
-file(GLOB NANOVG_SOURCES ${BGFX_DIR}/examples/common/nanovg/nanovg.cpp)
-set(ATLAS_SOURCES ${BGFX_DIR}/examples/common/cube_atlas.cpp)
-
-add_library(Canvas ${SOURCES} ${FONT_SOURCES} ${ATLAS_SOURCES} ${NANOVG_SOURCES} ${SHADERS})
+add_library(Canvas ${SOURCES} ${SHADERS})
 
 target_include_directories(Canvas
     PUBLIC "Include"
     PRIVATE "Source"
-    PRIVATE "${BGFX_DIR}/3rdparty"
-    PRIVATE "${BGFX_DIR}/examples/common"
-    PRIVATE "${BGFX_DIR}/examples/common/nanovg")
+    PRIVATE "${BGFX_DIR}/3rdparty")
 
 target_link_libraries(Canvas
     PUBLIC napi
@@ -141,6 +151,6 @@ endif()
 
 set_property(TARGET Canvas PROPERTY FOLDER Polyfills)
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
-source_group("3rd party Sources" ${CMAKE_CURRENT_SOURCE_DIR} FILES ${FONT_SOURCES} ${NANOVG_SOURCES} ${ATLAS_SOURCES})
+source_group("3rd party Sources" ${CMAKE_CURRENT_SOURCE_DIR} FILES ${FONT_SOURCES} ${ATLAS_SOURCES})
 source_group("Shaders" ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SHADERS})
-target_compile_definitions(Canvas PRIVATE _CRT_SECURE_NO_WARNINGS)
+target_compile_definitions(Canvas PRIVATE _CRT_SECURE_NO_WARNINGS)