changes for GLSL & HLSL shaders

CrossGL · Aug 22, 2024 · bb8de94 · bb8de94
1 parent c5f5b1b
commit bb8de94
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/Core/Graphics/RHI/Metal/METALPipelineHandler.cpp b/Core/Graphics/RHI/Metal/METALPipelineHandler.cpp
@@ -23,7 +23,8 @@ namespace CGL::Graphics {
 
         m_rpState = gpu_device->newRenderPipelineState(m_rpDescriptor, &ns_error);
 
-        if(!m_rpState) {
+        if(!m_rpState) 
+	{
             CGL_LOG(METALPipelineHandler, Error, ns_error->localizedDescription()->utf8String());
             return;
         }

diff --git a/Core/Graphics/RHI/Metal/METALPipelineHandler.h b/Core/Graphics/RHI/Metal/METALPipelineHandler.h
@@ -14,8 +14,8 @@ namespace CGL::Graphics
     public:
         METALPipelineHandler();
 
-        inline auto GetRenderPipelineDescriptor() const { return m_rpDescriptor; }
-        inline auto GetRenderPipelineState() const { return m_rpState; }
+        inline MTL::RenderPipelineDescriptor* GetRenderPipelineDescriptor() const { return m_rpDescriptor; }
+        inline MTL::RenderPipelineState* GetRenderPipelineState() const { return m_rpState; }
 
         void CreateRenderPipelineState(MTL::Device* gpu_device);
 

diff --git a/Core/Graphics/RHI/Metal/METALRenderer.cpp b/Core/Graphics/RHI/Metal/METALRenderer.cpp
@@ -58,9 +58,7 @@ namespace CGL::Graphics
     void Renderer::SetRenderPipeline_METAL()
     {
         GetImpl()->GetRenderPipelineHandler()->CreateRenderPipelineState(GetImpl()->GetDevice());
-        GetImpl()->GetRenderCommandEncoder()->setRenderPipelineState(
-            GetImpl()->GetRenderPipelineHandler()->GetRenderPipelineState()
-        );
+        GetImpl()->GetRenderCommandEncoder()->setRenderPipelineState(GetImpl()->GetRenderPipelineHandler()->GetRenderPipelineState());
     }
 
     void Renderer::SetPrimitiveTopology_METAL(PrimitiveType topology)

diff --git a/Samples/HelloTriangle/Assets/DirectX/HelloTriangleVS.hlsl b/Samples/HelloTriangle/Assets/DirectX/HelloTriangleVS.hlsl
@@ -1,6 +1,6 @@
 struct VS_INPUT
 {
-    float3 Position : POSITION;
+    float4 Position : POSITION;
     float3 Color    : COLOR0;
 };
 

diff --git a/Samples/HelloTriangle/Assets/OpenGL/HelloTriangleVS.vert b/Samples/HelloTriangle/Assets/OpenGL/HelloTriangleVS.vert
@@ -1,5 +1,5 @@
 #version 460 core
-layout (location = 0) in vec3 Position;
+layout (location = 0) in vec4 Position;
 layout (location = 1) in vec3 aColor;
 out vec3 Color;