From 4d4c9af3f9d3cf119a782835ad05ef015a56b0e4 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 17 Dec 2024 16:49:18 -0500 Subject: [PATCH] Rename more usages --- crates/gpui/src/platform/blade/blade_renderer.rs | 6 +++--- crates/gpui/src/platform/linux/wayland/window.rs | 4 ++-- crates/gpui/src/platform/linux/x11/window.rs | 4 ++-- crates/gpui/src/platform/windows/window.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/gpui/src/platform/blade/blade_renderer.rs b/crates/gpui/src/platform/blade/blade_renderer.rs index 6781d46ed4224..92becf2342446 100644 --- a/crates/gpui/src/platform/blade/blade_renderer.rs +++ b/crates/gpui/src/platform/blade/blade_renderer.rs @@ -3,7 +3,7 @@ use super::{BladeAtlas, PATH_TEXTURE_FORMAT}; use crate::{ - AtlasTextureKind, AtlasTile, Background, Bounds, ContentMask, DevicePixels, GPUSpecs, + AtlasTextureKind, AtlasTile, Background, Bounds, ContentMask, DevicePixels, GpuSpecs, MonochromeSprite, Path, PathId, PathVertex, PolychromeSprite, PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, Size, Underline, }; @@ -477,10 +477,10 @@ impl BladeRenderer { } #[cfg_attr(target_os = "macos", allow(dead_code))] - pub fn gpu_specs(&self) -> GPUSpecs { + pub fn gpu_specs(&self) -> GpuSpecs { let info = self.gpu.device_information(); - GPUSpecs { + GpuSpecs { is_software_emulated: info.is_software_emulated, device_name: info.device_name.clone(), driver_name: info.driver_name.clone(), diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs index 4cdf88e26268e..f87216eefd941 100644 --- a/crates/gpui/src/platform/linux/wayland/window.rs +++ b/crates/gpui/src/platform/linux/wayland/window.rs @@ -25,7 +25,7 @@ use crate::platform::linux::wayland::serial::SerialKind; use crate::platform::{PlatformAtlas, PlatformInputHandler, PlatformWindow}; use crate::scene::Scene; use crate::{ - px, size, AnyWindowHandle, Bounds, Decorations, GPUSpecs, Globals, Modifiers, Output, Pixels, + px, size, AnyWindowHandle, Bounds, Decorations, GpuSpecs, Globals, Modifiers, Output, Pixels, PlatformDisplay, PlatformInput, Point, PromptLevel, RequestFrameOptions, ResizeEdge, ScaledPixels, Size, Tiling, WaylandClientStatePtr, WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowControls, WindowDecorations, WindowParams, @@ -1019,7 +1019,7 @@ impl PlatformWindow for WaylandWindow { state.client.update_ime_position(bounds); } - fn gpu_specs(&self) -> Option { + fn gpu_specs(&self) -> Option { self.borrow().renderer.gpu_specs().into() } } diff --git a/crates/gpui/src/platform/linux/x11/window.rs b/crates/gpui/src/platform/linux/x11/window.rs index ae9abe714691f..2cce0f065d7bc 100644 --- a/crates/gpui/src/platform/linux/x11/window.rs +++ b/crates/gpui/src/platform/linux/x11/window.rs @@ -2,7 +2,7 @@ use anyhow::{anyhow, Context}; use crate::{ platform::blade::{BladeRenderer, BladeSurfaceConfig}, - px, size, AnyWindowHandle, Bounds, Decorations, DevicePixels, ForegroundExecutor, GPUSpecs, + px, size, AnyWindowHandle, Bounds, Decorations, DevicePixels, ForegroundExecutor, GpuSpecs, Modifiers, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow, Point, PromptLevel, RequestFrameOptions, ResizeEdge, ScaledPixels, Scene, Size, Tiling, WindowAppearance, WindowBackgroundAppearance, WindowBounds, WindowDecorations, @@ -1536,7 +1536,7 @@ impl PlatformWindow for X11Window { client.update_ime_position(bounds); } - fn gpu_specs(&self) -> Option { + fn gpu_specs(&self) -> Option { self.0.state.borrow().renderer.gpu_specs().into() } } diff --git a/crates/gpui/src/platform/windows/window.rs b/crates/gpui/src/platform/windows/window.rs index 16e2a3e7ac19f..be3deab631032 100644 --- a/crates/gpui/src/platform/windows/window.rs +++ b/crates/gpui/src/platform/windows/window.rs @@ -770,7 +770,7 @@ impl PlatformWindow for WindowsWindow { self.0.hwnd } - fn gpu_specs(&self) -> Option { + fn gpu_specs(&self) -> Option { Some(self.0.state.borrow().renderer.gpu_specs()) }