Fixed primitive types on Metal

ToniPlays · Jul 11, 2022 · 1091a5c · 1091a5c
1 parent 921d60b
commit 1091a5c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Hazard-Renderer/src/Backend/Metal/MetalPipeline.cpp b/Hazard-Renderer/src/Backend/Metal/MetalPipeline.cpp
@@ -8,11 +8,20 @@
 
 namespace HazardRenderer::Metal
 {
+    static MTL::PrimitiveType DrawTypeToMTLPrimitive(const DrawType& type) {
+
+        switch(type) {
+            case DrawType::Fill: return MTL::PrimitiveTypeTriangle;
+            case DrawType::Line: return MTL::PrimitiveTypeLine;
+            case DrawType::Point: return MTL::PrimitiveTypePoint;
+        }
+        return MTL::PrimitiveTypeTriangle;
+    }
+
     MetalPipeline::MetalPipeline(PipelineSpecification* specs)
     {
+        m_Specs = *specs;
         std::string file = File::ReadFile("res/" + specs->ShaderPath);
-
-
 
         NS::Error* error = nullptr;
 
@@ -62,7 +71,7 @@ namespace HazardRenderer::Metal
     {
         auto cmdBuffer = commandBuffer.As<MetalRenderCommandBuffer>();
         MTL::RenderCommandEncoder* encoder = cmdBuffer->GetEncoder();
-        encoder->drawIndexedPrimitives(MTL::PrimitiveTypeTriangle, count, MTL::IndexTypeUInt32, cmdBuffer->GetBoundIndexBuffer(), 0, 1);
+        encoder->drawIndexedPrimitives(DrawTypeToMTLPrimitive(m_Specs.DrawType), count, MTL::IndexTypeUInt32, cmdBuffer->GetBoundIndexBuffer(), 0, 1);
     }
     void MetalPipeline::DrawArrays(Ref<RenderCommandBuffer> commandBuffer, uint32_t count)
     {
@@ -73,7 +82,7 @@ namespace HazardRenderer::Metal
 
         auto cmdBuffer = commandBuffer.As<MetalRenderCommandBuffer>();
         MTL::RenderCommandEncoder* encoder = cmdBuffer->GetEncoder();
-        encoder->drawIndexedPrimitives(MTL::PrimitiveTypeTriangle, count, MTL::IndexTypeUInt32, cmdBuffer->GetBoundIndexBuffer(), 0, instanceCount);
+        encoder->drawIndexedPrimitives(DrawTypeToMTLPrimitive(m_Specs.DrawType), count, MTL::IndexTypeUInt32, cmdBuffer->GetBoundIndexBuffer(), 0, instanceCount);
     }
 }
 #endif
diff --git a/Hazard-Renderer/src/Backend/Metal/MetalPipeline.h b/Hazard-Renderer/src/Backend/Metal/MetalPipeline.h
@@ -31,7 +31,6 @@ namespace HazardRenderer::Metal
     private:
         PipelineSpecification m_Specs;
         Ref<Shader> m_Shader;
-        uint32_t m_DrawType, m_PolygonMode;
 
         MTL::RenderPipelineState* m_Pipeline = nullptr;
     };

diff --git a/HazardLauncher/.DS_Store b/HazardLauncher/.DS_Store
diff --git a/HazardLauncher/res/QuadInstanced.metal b/HazardLauncher/res/QuadInstanced.metal
@@ -19,6 +19,7 @@ struct Camera
 
 struct VertexOut {
     float4 position [[position]];
+    float PointSize [[point_size]];
     float4 color;
 };
 
@@ -43,6 +44,8 @@ vertex VertexOut Vertex (
         VertexOut out;
         out.position = u_Camera.ViewProjection * transform * float4(input.a_Position, 1.0);
         out.color = data.a_Color;
+
+        out.PointSize = 10.0;
 
         return out;
 }

diff --git a/HazardLauncher/src/tests/Rendering/InstancingTest.h b/HazardLauncher/src/tests/Rendering/InstancingTest.h
@@ -124,7 +124,7 @@ namespace InstancingTest {
         spec.ShaderPath = "QuadInstanced.metal";
 #endif
 
-		spec.DrawType = DrawType::Fill;
+		spec.DrawType = DrawType::Point;
 		spec.CullMode = CullMode::None;
 		spec.Usage = PipelineUsage::GraphicsBit;
 		spec.pTargetRenderPass = window->GetSwapchain()->GetRenderPass().Raw();