Skip to content

gpui_windows: Recover renderers after DirectX device loss #63500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
railapex wants to merge 1 commit into from
Closed

gpui_windows: Recover renderers after DirectX device loss #63500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions crates/gpui_windows/src/direct_write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl Drop for DirectWriteComponents {
}
}

struct GPUState {
pub(crate) struct GPUState {
device: ID3D11Device,
device_context: ID3D11DeviceContext,
sampler: Option<ID3D11SamplerState>,
Expand Down Expand Up @@ -110,7 +110,7 @@ impl GPUState {
],
};
unsafe { device.CreateBlendState(&desc, Some(&mut blend_state)) }?;
blend_state.unwrap()
blend_state.context("CreateBlendState returned no DirectWrite blend state")?
};

let sampler = {
Expand Down Expand Up @@ -138,7 +138,7 @@ impl GPUState {
)?;
let mut shader = None;
unsafe { device.CreateVertexShader(source.as_bytes(), None, Some(&mut shader)) }?;
shader.unwrap()
shader.context("CreateVertexShader returned no DirectWrite vertex shader")?
};

let pixel_shader = {
Expand All @@ -148,7 +148,7 @@ impl GPUState {
)?;
let mut shader = None;
unsafe { device.CreatePixelShader(source.as_bytes(), None, Some(&mut shader)) }?;
shader.unwrap()
shader.context("CreatePixelShader returned no DirectWrite pixel shader")?
};

Ok(Self {
Expand Down Expand Up @@ -218,8 +218,14 @@ impl DirectWriteTextSystem {
})
}

pub(crate) fn handle_gpu_lost(&self, directx_devices: &DirectXDevices) -> Result<()> {
self.state.write().handle_gpu_lost(directx_devices)
pub(crate) fn build_gpu_recovery_candidate(
directx_devices: &DirectXDevices,
) -> Result<GPUState> {
GPUState::new(directx_devices).context("Recreating GPU state for DirectWrite")
}

pub(crate) fn commit_gpu_recovery(&self, gpu_state: GPUState) {
self.state.write().gpu_state = gpu_state;
}
}

Expand Down Expand Up @@ -1279,13 +1285,6 @@ impl DirectWriteState {
));
result
}

fn handle_gpu_lost(&mut self, directx_devices: &DirectXDevices) -> Result<()> {
try_to_recover_from_device_lost(|| {
GPUState::new(directx_devices).context("Recreating GPU state for DirectWrite")
})
.map(|gpu_state| self.gpu_state = gpu_state)
}
}

struct GlyphLayerTexture {
Expand Down
101 changes: 70 additions & 31 deletions crates/gpui_windows/src/directx_atlas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use gpui::{
pub(crate) struct DirectXAtlas(Mutex<DirectXAtlasState>);

struct DirectXAtlasState {
device: ID3D11Device,
device_context: ID3D11DeviceContext,
device: Option<ID3D11Device>,
device_context: Option<ID3D11DeviceContext>,
monochrome_textures: AtlasTextureList<DirectXAtlasTexture>,
polychrome_textures: AtlasTextureList<DirectXAtlasTexture>,
subpixel_textures: AtlasTextureList<DirectXAtlasTexture>,
Expand All @@ -37,8 +37,19 @@ struct DirectXAtlasTexture {
impl DirectXAtlas {
pub(crate) fn new(device: &ID3D11Device, device_context: &ID3D11DeviceContext) -> Self {
DirectXAtlas(Mutex::new(DirectXAtlasState {
device: device.clone(),
device_context: device_context.clone(),
device: Some(device.clone()),
device_context: Some(device_context.clone()),
monochrome_textures: Default::default(),
polychrome_textures: Default::default(),
subpixel_textures: Default::default(),
tiles_by_key: Default::default(),
}))
}

pub(crate) fn new_suspended() -> Self {
DirectXAtlas(Mutex::new(DirectXAtlasState {
device: None,
device_context: None,
monochrome_textures: Default::default(),
polychrome_textures: Default::default(),
subpixel_textures: Default::default(),
Expand All @@ -49,10 +60,19 @@ impl DirectXAtlas {
pub(crate) fn get_texture_view(
&self,
id: AtlasTextureId,
) -> [Option<ID3D11ShaderResourceView>; 1] {
) -> anyhow::Result<[Option<ID3D11ShaderResourceView>; 1]> {
let lock = self.0.lock();
let tex = lock.texture(id);
tex.view.clone()
let tex = lock
.texture(id)
.ok_or_else(|| anyhow::anyhow!("atlas texture is unavailable after device loss"))?;
Ok(tex.view.clone())
}

pub(crate) fn suspend(&self) {
let mut lock = self.0.lock();
lock.device = None;
lock.device_context = None;
lock.clear_textures();
}

pub(crate) fn handle_device_lost(
Expand All @@ -61,12 +81,18 @@ impl DirectXAtlas {
device_context: &ID3D11DeviceContext,
) {
let mut lock = self.0.lock();
lock.device = device.clone();
lock.device_context = device_context.clone();
lock.monochrome_textures = AtlasTextureList::default();
lock.polychrome_textures = AtlasTextureList::default();
lock.subpixel_textures = AtlasTextureList::default();
lock.tiles_by_key.clear();
lock.device = Some(device.clone());
lock.device_context = Some(device_context.clone());
lock.clear_textures();
}
}

impl DirectXAtlasState {
fn clear_textures(&mut self) {
self.monochrome_textures = AtlasTextureList::default();
self.polychrome_textures = AtlasTextureList::default();
self.subpixel_textures = AtlasTextureList::default();
self.tiles_by_key.clear();
}
}

Expand All @@ -79,6 +105,10 @@ impl PlatformAtlas for DirectXAtlas {
>,
) -> anyhow::Result<Option<AtlasTile>> {
let mut lock = self.0.lock();
let device_context = lock
.device_context
.clone()
.ok_or_else(|| anyhow::anyhow!("atlas is suspended after device loss"))?;
if let Some(tile) = lock.tiles_by_key.get(key) {
Ok(Some(*tile))
} else {
Expand All @@ -88,8 +118,10 @@ impl PlatformAtlas for DirectXAtlas {
let tile = lock
.allocate(size, key.texture_kind())
.ok_or_else(|| anyhow::anyhow!("failed to allocate"))?;
let texture = lock.texture(tile.texture_id);
texture.upload(&lock.device_context, tile.bounds, &bytes);
let texture = lock
.texture(tile.texture_id)
.ok_or_else(|| anyhow::anyhow!("allocated atlas texture is missing"))?;
texture.upload(&device_context, tile.bounds, &bytes);
lock.tiles_by_key.insert(key.clone(), tile);
Ok(Some(tile))
}
Expand Down Expand Up @@ -156,6 +188,7 @@ impl DirectXAtlasState {
min_size: Size<DevicePixels>,
kind: AtlasTextureKind,
) -> Option<&mut DirectXAtlasTexture> {
let device = self.device.as_ref()?;
const DEFAULT_ATLAS_SIZE: Size<DevicePixels> = Size {
width: DevicePixels(1024),
height: DevicePixels(1024),
Expand Down Expand Up @@ -206,11 +239,11 @@ impl DirectXAtlasState {
unsafe {
// This only returns None if the device is lost, which we will recreate later.
// So it's ok to return None here.
self.device
device
.CreateTexture2D(&texture_desc, None, Some(&mut texture))
.ok()?;
}
let texture = texture.unwrap();
let texture = texture?;

let texture_list = match kind {
AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
Expand All @@ -220,10 +253,10 @@ impl DirectXAtlasState {
let index = texture_list.free_list.pop();
let view = unsafe {
let mut view = None;
self.device
device
.CreateShaderResourceView(&texture, None, Some(&mut view))
.ok()?;
[view]
[Some(view?)]
};
let atlas_texture = DirectXAtlasTexture {
id: AtlasTextureId {
Expand All @@ -238,24 +271,30 @@ impl DirectXAtlasState {
};
if let Some(ix) = index {
texture_list.textures[ix] = Some(atlas_texture);
texture_list.textures.get_mut(ix).unwrap().as_mut()
texture_list.textures.get_mut(ix)?.as_mut()
} else {
texture_list.textures.push(Some(atlas_texture));
texture_list.textures.last_mut().unwrap().as_mut()
texture_list.textures.last_mut()?.as_mut()
}
}

fn texture(&self, id: AtlasTextureId) -> &DirectXAtlasTexture {
fn texture(&self, id: AtlasTextureId) -> Option<&DirectXAtlasTexture> {
match id.kind {
AtlasTextureKind::Monochrome => &self.monochrome_textures[id.index as usize]
.as_ref()
.unwrap(),
AtlasTextureKind::Polychrome => &self.polychrome_textures[id.index as usize]
.as_ref()
.unwrap(),
AtlasTextureKind::Subpixel => {
&self.subpixel_textures[id.index as usize].as_ref().unwrap()
}
AtlasTextureKind::Monochrome => self
.monochrome_textures
.textures
.get(id.index as usize)?
.as_ref(),
AtlasTextureKind::Polychrome => self
.polychrome_textures
.textures
.get(id.index as usize)?
.as_ref(),
AtlasTextureKind::Subpixel => self
.subpixel_textures
.textures
.get(id.index as usize)?
.as_ref(),
}
}
}
Expand Down
15 changes: 0 additions & 15 deletions crates/gpui_windows/src/directx_devices.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use anyhow::{Context, Result};
use gpui_util::ResultExt;
use itertools::Itertools;
use windows::Win32::{
Foundation::HMODULE,
Graphics::{
Expand All @@ -21,20 +20,6 @@ use windows::Win32::{
};
use windows::core::Interface;

pub(crate) fn try_to_recover_from_device_lost<T>(mut f: impl FnMut() -> Result<T>) -> Result<T> {
(0..5)
.map(|i| {
if i > 0 {
// Add a small delay before retrying
std::thread::sleep(std::time::Duration::from_millis(100 + i * 10));
}
f()
})
.find_or_last(Result::is_ok)
.unwrap()
.context("DirectXRenderer failed to recover from lost device after multiple attempts")
}

#[derive(Clone)]
pub(crate) struct DirectXDevices {
pub(crate) adapter: IDXGIAdapter1,
Expand Down
Loading
Loading