Use display-bound wgpu instance#119
Merged
Merged
Conversation
Create the GUI render instance from winit's display handle. This gives GLES presentation the Wayland display connection wgpu expects. Keep that instance in the render GPU context. Reuse it for secondary window surfaces. Use env-aware descriptors so WGPU_BACKEND is honored. Constraint: Scope to wgpu ownership and adapter selection Rejected: Replace renderer backend | too broad for this fix Confidence: medium Scope-risk: moderate Not-tested: Haswell HD 4600 under niri/Wayland
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request refactors the wgpu initialization and state management in the display runtime. It consolidates several wgpu-related fields (instance, adapter, device, and queue) into a unified RenderGpuContext struct, and updates the initialization paths to use display-bound descriptors from the environment (which is particularly important for GLES presentation on Wayland). The feedback highlights two opportunities to avoid unnecessary cloning of wgpu resources: first, by passing a reference to the device during window resize events, and second, by moving the device and queue directly into the RenderGpuContext during bootstrap.
Comment on lines
+57
to
59
| } else if let Some(device) = self.gpu.as_ref().map(|gpu| gpu.device.clone()) { | ||
| if let Some(ws) = self.multi_windows.get_mut(emacs_fid) { | ||
| ws.handle_resize(&device, size.width, size.height); |
There was a problem hiding this comment.
We can avoid cloning the Arc<wgpu::Device> here by matching on &self.gpu and passing a reference to gpu.device directly, since ws.handle_resize only requires a reference &wgpu::Device.
Suggested change
| } else if let Some(device) = self.gpu.as_ref().map(|gpu| gpu.device.clone()) { | |
| if let Some(ws) = self.multi_windows.get_mut(emacs_fid) { | |
| ws.handle_resize(&device, size.width, size.height); | |
| } else if let Some(gpu) = &self.gpu { | |
| if let Some(ws) = self.multi_windows.get_mut(emacs_fid) { | |
| ws.handle_resize(&gpu.device, size.width, size.height); |
Comment on lines
+143
to
+148
| self.gpu = Some(RenderGpuContext { | ||
| instance, | ||
| adapter, | ||
| device: device.clone(), | ||
| queue: queue.clone(), | ||
| }); |
There was a problem hiding this comment.
Since device and queue are not used after this point in init_wgpu, we can move them directly into RenderGpuContext instead of cloning them.
Suggested change
| self.gpu = Some(RenderGpuContext { | |
| instance, | |
| adapter, | |
| device: device.clone(), | |
| queue: queue.clone(), | |
| }); | |
| self.gpu = Some(RenderGpuContext { | |
| instance, | |
| adapter, | |
| device, | |
| queue, | |
| }); |
|
thanks,it work. |
Owner
Author
|
can neomacs -Q work? Can window show? Can cursor animate? @CarefreeLee |
yes,all it can work,but have some bug repo i put it in Failed to find suitable GPU adapter: NotFound { active_backends: Backends(VULKAN | GL), requested_backends: Backends(NOOP | VULKAN | GL | METAL | DX12 | BROWSER_WEBGPU), supported_backends: Backends(VULKAN | GL), no_fallback_backends: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Why
CarefreeLee's logs in #109 show wgpu GLES initializing with no known windowing system and falling back to surfaceless EGL, then rejecting the GL adapter as incompatible with the Wayland surface. wgpu 29 documents that GLES presentation needs the display handle, especially on Wayland.
Verification
Not Verified
Fixes #109