diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs
index b5fe0973a..d99f4df2a 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs
@@ -567,9 +567,16 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
 
         private static void DeclareInputAttributePerPatch(CodeGenContext context, int attr)
         {
+            string layout = string.Empty;
+
+            if (context.Config.Options.TargetApi == TargetApi.Vulkan)
+            {
+                layout = $"layout (location = {32 + attr}) ";
+            }
+
             string name = $"{DefaultNames.PerPatchAttributePrefix}{attr}";
 
-            context.AppendLine($"patch in vec4 {name};");
+            context.AppendLine($"{layout}patch in vec4 {name};");
         }
 
         private static void DeclareOutputAttributes(CodeGenContext context, StructuredProgramInfo info)
@@ -630,9 +637,16 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
 
         private static void DeclareOutputAttributePerPatch(CodeGenContext context, int attr)
         {
+            string layout = string.Empty;
+
+            if (context.Config.Options.TargetApi == TargetApi.Vulkan)
+            {
+                layout = $"layout (location = {32 + attr}) ";
+            }
+
             string name = $"{DefaultNames.PerPatchAttributePrefix}{attr}";
 
-            context.AppendLine($"patch out vec4 {name};");
+            context.AppendLine($"{layout}patch out vec4 {name};");
         }
 
         private static void DeclareSupportUniformBlock(CodeGenContext context, ShaderStage stage, int scaleElements)
diff --git a/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs b/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs
index 96ac76c66..9e4a363f9 100644
--- a/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs
+++ b/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs
@@ -341,6 +341,7 @@ namespace Ryujinx.Graphics.Vulkan
                 ShaderImageGatherExtended = true,
                 // ShaderStorageImageReadWithoutFormat = true,
                 // ShaderStorageImageWriteWithoutFormat = true,
+                TessellationShader = true,
                 VertexPipelineStoresAndAtomics = true
             };