Add support for mat3 to shader compiler (#1299)

BabylonJS · Sep 27, 2023 · c84cc68 · c84cc68
1 parent 71a89f7
commit c84cc68
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Plugins/NativeEngine/Source/NativeEngine.cpp b/Plugins/NativeEngine/Source/NativeEngine.cpp
@@ -1061,7 +1061,7 @@ namespace Babylon
 
         assert(matrix.size() == size * size);
 
-        if constexpr (size < 4)
+        if constexpr (size < 3)
         {
             std::array<float, 16> matrixValues{};
             size_t index = 0;

diff --git a/Plugins/NativeEngine/Source/ShaderCompilerCommon.cpp b/Plugins/NativeEngine/Source/ShaderCompilerCommon.cpp
@@ -30,6 +30,9 @@ namespace Babylon::ShaderCompilerCommon
                 case NonSamplerUniformsInfo::Uniform::TypeEnum::Mat4:
                     bgfxType = bgfx::UniformType::Mat4;
                     break;
+                case NonSamplerUniformsInfo::Uniform::TypeEnum::Mat3:
+                    bgfxType = bgfx::UniformType::Mat3;
+                    break;
                 default:
                     throw std::runtime_error{"Unrecognized uniform type."};
             }
@@ -98,6 +101,11 @@ namespace Babylon::ShaderCompilerCommon
                     uniform.Type = NonSamplerUniformsInfo::Uniform::TypeEnum::Mat4;
                     uniform.RegisterSize = 4;
                 }
+                else if (spirType.columns == 3 && spirType.vecsize == 3)
+                {
+                    uniform.Type = NonSamplerUniformsInfo::Uniform::TypeEnum::Mat3;
+                    uniform.RegisterSize = 4;
+                }
                 else
                 {
                     throw std::runtime_error{"Unrecognized uniform type."};
@@ -137,6 +145,11 @@ namespace Babylon::ShaderCompilerCommon
                         uniform.Type = NonSamplerUniformsInfo::Uniform::TypeEnum::Mat4;
                         uniform.RegisterSize = 4;
                     }
+                    else if (type.columns == 3 && type.vecsize == 3)
+                    {
+                        uniform.Type = NonSamplerUniformsInfo::Uniform::TypeEnum::Mat3;
+                        uniform.RegisterSize = 4;
+                    }
                     else
                     {
                         throw std::runtime_error{"Unrecognized uniform type."};

diff --git a/Plugins/NativeEngine/Source/ShaderCompilerCommon.h b/Plugins/NativeEngine/Source/ShaderCompilerCommon.h
@@ -41,7 +41,8 @@ namespace Babylon::ShaderCompilerCommon
             enum class TypeEnum
             {
                 Vec4,
-                Mat4
+                Mat4,
+                Mat3,
             };
 
             std::string Name{};
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,8 @@ namespace Babylon::ShaderCompilerCommon @@
                 enum class TypeEnum
                 {
                     Vec4,
-                    Mat4
+                    Mat4,
+                    Mat3,
                 };
                 std::string Name{};
@@ Expand Down @@