fix(gpu): 避免 Windows 独显错误使用 DX12 (#230)

* fix(gpu): 避免 Windows 独显错误使用 DX12

Windows hybrid-GPU machines can select the NVIDIA discrete adapter through DX12 and then crash while creating the Rect render pipeline with a wgpu shader translation error. Request high-performance GPUs at the PE export level, default Windows rendering to Vulkan, and keep high-performance NVIDIA Vulkan adapters ahead of integrated GPUs.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

* fix(gpu): 灰度 Windows 高性能 GPU 默认值

将 Windows 默认高性能 GPU + Vulkan 后端放到 WindowsHighPerformanceGpuDefault flag 后，默认用户继续走集显/未指定后端路径。

同时限制 PE 导出链接参数只用于 MSVC，并抑制驱动查表符号必须保留原名导致的命名警告。

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

* fix(gpu): gate high-perf GPU exports behind feature flag

---------

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Co-authored-by: zero <1603852@qq.com>

Author: 3 people

app/Cargo.toml

@@ -409,6 +409,7 @@ ai_resume_button = []
 autoupdate = []
 figma_detection = []
 bundled_skills = []
+windows_high_performance_gpu_default = []
 agent_mode = []
 agent_mode_computer_use = []
 agent_mode_debug = []

app/build.rs

@@ -28,6 +28,7 @@ fn main() -> Result<()> {
 
     let target_os = env::var("CARGO_CFG_TARGET_OS")?;
     let target_family = env::var("CARGO_CFG_TARGET_FAMILY")?;
+    let target_env = env::var("CARGO_CFG_TARGET_ENV")?;
 
     add_features(&target_family, &target_os);
 
@@ -115,6 +116,15 @@ fn main() -> Result<()> {
     }
 
     if target_os == "windows" {
+        if target_env == "msvc"
+            && env::var("CARGO_FEATURE_WINDOWS_HIGH_PERFORMANCE_GPU_DEFAULT").is_ok()
+        {
+            println!("cargo:rustc-link-arg-bin=zap-oss=/EXPORT:NvOptimusEnablement,DATA");
+            println!(
+                "cargo:rustc-link-arg-bin=zap-oss=/EXPORT:AmdPowerXpressRequestHighPerformance,DATA"
+            );
+        }
+
         // Retrieve the Cargo profile name so that we can put a copy of ConPTY in
         // the correct target subdirectory.
         //

app/src/bin/generate_settings_schema.rs

@@ -104,6 +104,9 @@ fn active_flags_for_channel(channel: &str) -> HashSet<FeatureFlag> {
         }
     }
 
+    #[cfg(feature = "windows_high_performance_gpu_default")]
+    flags.insert(FeatureFlag::WindowsHighPerformanceGpuDefault);
+
     flags
 }
 
@@ -168,6 +171,11 @@ fn main() {
     }
 
     let active_flags = active_flags_for_channel(channel);
+    for flag in &active_flags {
+        flag.set_enabled(true);
+    }
+    warp_core::features::mark_initialized();
+
     let mut generator = SchemaGenerator::default();
     let mut root_properties = Map::new();
     let mut entry_count = 0;

app/src/bin/zap_oss.rs

@@ -9,6 +9,18 @@ use warp_core::{
     AppId,
 };
 
+#[cfg(all(target_os = "windows", feature = "windows_high_performance_gpu_default"))]
+#[allow(non_upper_case_globals)]
+#[no_mangle]
+#[used]
+pub static NvOptimusEnablement: u32 = 1;
+
+#[cfg(all(target_os = "windows", feature = "windows_high_performance_gpu_default"))]
+#[allow(non_upper_case_globals)]
+#[no_mangle]
+#[used]
+pub static AmdPowerXpressRequestHighPerformance: u32 = 1;
+
 // Zap OSS 构建的入口,简单包一层 warp::run()。
 fn main() -> Result<()> {
     let mut state = ChannelState::new(

app/src/lib.rs

@@ -2297,6 +2297,8 @@ pub fn enabled_features() -> HashSet<FeatureFlag> {
         FeatureFlag::InBandGeneratorsForSSH,
         #[cfg(feature = "run_generators_with_cmd_exe")]
         FeatureFlag::RunGeneratorsWithCmdExe,
+        #[cfg(feature = "windows_high_performance_gpu_default")]
+        FeatureFlag::WindowsHighPerformanceGpuDefault,
         #[cfg(feature = "ligatures")]
         FeatureFlag::Ligatures,
         #[cfg(feature = "selectable_prompt")]
@@ -2683,5 +2685,10 @@ pub fn enabled_features() -> HashSet<FeatureFlag> {
 /// `ZAP_UNSTABLE_FEATURES` 接受的不稳定功能名 -> FeatureFlag 映射。
 /// 这里登记的功能在 release 构建下默认隐藏,设置对应 token 后才会出现;
 /// dev 构建走 debug_assertions 分支默认启用,无需该变量。
-const UNSTABLE_FEATURES: &[(&str, FeatureFlag)] =
-    &[("server_file_browser", FeatureFlag::ServerFileBrowser)];
+const UNSTABLE_FEATURES: &[(&str, FeatureFlag)] = &[
+    ("server_file_browser", FeatureFlag::ServerFileBrowser),
+    (
+        "windows_high_performance_gpu_default",
+        FeatureFlag::WindowsHighPerformanceGpuDefault,
+    ),
+];

app/src/settings/gpu.rs

@@ -1,24 +1,28 @@
 use settings::{macros::define_settings_group, SupportedPlatforms, SyncToCloud};
+use warp_core::features::FeatureFlag;
 use warpui::platform::GraphicsBackend;
 
+fn default_to_windows_high_performance_gpu() -> bool {
+    cfg!(windows) && FeatureFlag::WindowsHighPerformanceGpuDefault.is_enabled()
+}
+
 define_settings_group!(GPUSettings, settings: [
-   prefer_low_power_gpu: PreferLowPowerGPU {
-       type: bool,
-       // Opt for the low power (integrated) GPU on Windows / Linux since discrete GPUs tend to be
-        // more unstable.
-       default: cfg!(any(target_os = "linux", target_os = "freebsd", windows)),
-       supported_platforms: SupportedPlatforms::ALL,
-       sync_to_cloud: SyncToCloud::Never,
-       private: false,
-       toml_path: "system.prefer_low_power_gpu",
-       description: "Whether to prefer the integrated (low-power) GPU.",
-   },
-   preferred_backend: PreferredGraphicsBackend {
-       type: Option<GraphicsBackend>,
-       default: None,
-       supported_platforms: SupportedPlatforms::WINDOWS,
-       sync_to_cloud: SyncToCloud::Never,
-       private: false,
+    prefer_low_power_gpu: PreferLowPowerGPU {
+        type: bool,
+        default: cfg!(any(target_os = "linux", target_os = "freebsd"))
+            || (cfg!(windows) && !default_to_windows_high_performance_gpu()),
+        supported_platforms: SupportedPlatforms::ALL,
+        sync_to_cloud: SyncToCloud::Never,
+        private: false,
+        toml_path: "system.prefer_low_power_gpu",
+        description: "Whether to prefer the integrated (low-power) GPU.",
+    },
+    preferred_backend: PreferredGraphicsBackend {
+        type: Option<GraphicsBackend>,
+        default: default_to_windows_high_performance_gpu().then_some(GraphicsBackend::Vulkan),
+        supported_platforms: SupportedPlatforms::WINDOWS,
+        sync_to_cloud: SyncToCloud::Never,
+        private: false,
        toml_path: "system.preferred_graphics_backend",
        description: "The preferred graphics backend on Windows.",
    },

crates/warp_features/src/lib.rs

@@ -59,6 +59,9 @@ pub enum FeatureFlag {
     /// discrete GPU.
     IntegratedGPU,
 
+    /// Defaults Windows builds to the high-performance GPU with Vulkan as the preferred backend.
+    WindowsHighPerformanceGpuDefault,
+
     /// Zap Agent Mode.
     AgentMode,
 

crates/warpui/src/rendering/wgpu/resources.rs

@@ -342,6 +342,7 @@ pub(super) fn sort_adapters(
         .sorted_by_cached_key(|adapter| {
             adapter_stability_sort_func(
                 adapter,
+                gpu_power_preference,
                 windowing_system,
                 downrank_non_nvidia_vulkan_adapters,
             )
@@ -697,6 +698,7 @@ fn adapter_backend_sort_func(
 /// us to attempt to use it than for us to give up without trying.
 fn adapter_stability_sort_func(
     adapter: &wgpu::Adapter,
+    gpu_power_preference: &GPUPowerPreference,
     windowing_system: Option<windowing::System>,
     downrank_non_nvidia_vulkan_adapters: bool,
 ) -> AdapterSupport {
@@ -741,7 +743,9 @@ fn adapter_stability_sort_func(
             *MIN_SUPPORTED_NVIDIA_VERSION
         );
         AdapterSupport::Unsupported
-    } else if is_newer_nondx12_nvidia_adapter_on_windows(&adapter_info) {
+    } else if is_newer_nondx12_nvidia_adapter_on_windows(&adapter_info)
+        && !matches!(gpu_power_preference, GPUPowerPreference::HighPerformance)
+    {
         log::warn!(
             "Deprioritizing non DX12 Nvidia adapter due to version > {} (unsupported). Newer NVIDIA \
             drivers can crash if multiple windows are created if the `Vulkan / OpenGL Present Method\