refactor: refactor shader interface

ExplosionEngine · Apr 14, 2024 · 085320c · 085320c
1 parent 9dd7024
commit 085320c
Show file tree

Hide file tree

Showing 7 changed files with 517 additions and 312 deletions.
diff --git a/Engine/Source/RHI/Include/RHI/Pipeline.h b/Engine/Source/RHI/Include/RHI/Pipeline.h
@@ -27,9 +27,11 @@ namespace RHI {
         uint8_t location;
 
         GlslVertexBinding();
-        GlslVertexBinding(uint8_t inLocation);
+        explicit GlslVertexBinding(uint8_t inLocation);
     };
 
+    using PlatformVertexBinding = std::variant<HlslVertexBinding, GlslVertexBinding>;
+
     template <typename Derived>
     struct VertexAttributeBase {
         VertexFormat format;
@@ -44,14 +46,14 @@ namespace RHI {
     };
 
     struct VertexAttribute : public VertexAttributeBase<VertexAttribute> {
-        std::variant<HlslVertexBinding, GlslVertexBinding> platformBinding;
+        PlatformVertexBinding platformBinding;
 
         explicit VertexAttribute(
-            const std::variant<HlslVertexBinding, GlslVertexBinding>& inPlatformBinding = {},
+            const PlatformVertexBinding& inPlatformBinding = {},
             VertexFormat inFormat = VertexFormat::max,
             size_t inOffset = 0);
 
-        VertexAttribute& SetPlatformBinding(std::variant<HlslVertexBinding, GlslVertexBinding> inPlatformBinding);
+        VertexAttribute& SetPlatformBinding(PlatformVertexBinding inPlatformBinding);
     };
 
     template <typename Derived>

diff --git a/Engine/Source/RHI/Src/Pipeline.cpp b/Engine/Source/RHI/Src/Pipeline.cpp
@@ -27,13 +27,13 @@ namespace RHI {
     {
     }
 
-    VertexAttribute::VertexAttribute(const std::variant<HlslVertexBinding, GlslVertexBinding>& inPlatformBinding, VertexFormat inFormat, size_t inOffset)
+    VertexAttribute::VertexAttribute(const PlatformVertexBinding& inPlatformBinding, VertexFormat inFormat, size_t inOffset)
         : VertexAttributeBase<VertexAttribute>(inFormat, inOffset)
         , platformBinding(inPlatformBinding)
     {
     }
 
-    VertexAttribute& VertexAttribute::SetPlatformBinding(std::variant<HlslVertexBinding, GlslVertexBinding> inPlatformBinding)
+    VertexAttribute& VertexAttribute::SetPlatformBinding(PlatformVertexBinding inPlatformBinding)
     {
         platformBinding = inPlatformBinding;
         return *this;