From f416cac87417a2385f872aeb2797d2fe495dd492 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Wed, 29 Sep 2021 00:14:39 +0200
Subject: [PATCH] early-access version 2089

---
 README.md                                             |  2 +-
 .../renderer_vulkan/vk_graphics_pipeline.cpp          | 11 ++++++++++-
 src/yuzu/configuration/config.cpp                     |  4 ++++
 src/yuzu/configuration/configure_input_advanced.cpp   |  4 ++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b1ab255fa..7b10dbfad 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 2088.
+This is the source code for early-access 2089.
 
 ## Legal Notice
 
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index 11cd41ad7..8634c3316 100755
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -568,12 +568,21 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
     if (!vertex_binding_divisors.empty()) {
         vertex_input_ci.pNext = &input_divisor_ci;
     }
+    const bool has_tess_stages = spv_modules[1] || spv_modules[2];
     auto input_assembly_topology = MaxwellToVK::PrimitiveTopology(device, key.state.topology);
     if (input_assembly_topology == VK_PRIMITIVE_TOPOLOGY_PATCH_LIST) {
-        if (!spv_modules[1] && !spv_modules[2]) {
+        if (!has_tess_stages) {
             LOG_WARNING(Render_Vulkan, "Patch topology used without tessellation, using points");
             input_assembly_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
         }
+    } else {
+        if (has_tess_stages) {
+            // The Vulkan spec requires patch list IA topology be used with tessellation
+            // shader stages. Forcing it fixes a crash on some drivers
+            LOG_WARNING(Render_Vulkan,
+                        "Patch topology not used with tessellation, using patch list");
+            input_assembly_topology = VK_PRIMITIVE_TOPOLOGY_PATCH_LIST;
+        }
     }
     const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{
         .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 27b67fd9e..b5796a8fc 100755
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -562,7 +562,11 @@ void Config::ReadControlValues() {
     ReadTouchscreenValues();
     ReadMotionTouchValues();
 
+#ifdef _WIN32
     ReadBasicSetting(Settings::values.enable_raw_input);
+#else
+    Settings::values.enable_raw_input = false;
+#endif
     ReadBasicSetting(Settings::values.emulate_analog_keyboard);
     Settings::values.mouse_panning = false;
     ReadBasicSetting(Settings::values.mouse_panning_sensitivity);
diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp
index d20fd86b6..b30f09013 100755
--- a/src/yuzu/configuration/configure_input_advanced.cpp
+++ b/src/yuzu/configuration/configure_input_advanced.cpp
@@ -88,6 +88,10 @@ ConfigureInputAdvanced::ConfigureInputAdvanced(QWidget* parent)
     connect(ui->buttonMotionTouch, &QPushButton::clicked, this,
             &ConfigureInputAdvanced::CallMotionTouchConfigDialog);
 
+#ifndef _WIN32
+    ui->enable_raw_input->setVisible(false);
+#endif
+
     LoadConfiguration();
 }