Skip to content

Commit

Permalink
blade: Update to pick up Intel memory coherency fix & fix calling bla…
Browse files Browse the repository at this point in the history
…de params (zed-industries#15829)

Builds on @kvark's PR zed-industries#15781
by fixing call to Blades `create_texture_view` the arguments of which
had changed.


Picks up kvark/blade#153

Release Notes:

- Fixed Zed flickering on Linux when using Intel graphics.
([zed-industries#14101](zed-industries#14101)).

---------

Co-authored-by: Dzmitry Malyshau <[email protected]>
Co-authored-by: Thorsten Ball <[email protected]>
  • Loading branch information
3 people authored Aug 6, 2024
1 parent 44ae9ef commit fb1cd7c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,9 @@ async-watch = "0.3.1"
async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
base64 = "0.22"
bitflags = "2.6.0"
blade-graphics = { git = "https://github.com/zed-industries/blade", rev = "7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e" }
blade-macros = { git = "https://github.com/zed-industries/blade", rev = "7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e" }
blade-util = { git = "https://github.com/zed-industries/blade", rev = "7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e" }
blade-graphics = { git = "https://github.com/kvark/blade", rev = "ac25c77ed8d86c386a541c935ffe0a0f6024e701" }
blade-macros = { git = "https://github.com/kvark/blade", rev = "ac25c77ed8d86c386a541c935ffe0a0f6024e701" }
blade-util = { git = "https://github.com/kvark/blade", rev = "ac25c77ed8d86c386a541c935ffe0a0f6024e701" }
cargo_metadata = "0.18"
cargo_toml = "0.20"
chrono = { version = "0.4", features = ["serde"] }
Expand Down
16 changes: 9 additions & 7 deletions crates/gpui/src/platform/blade/blade_atlas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,15 @@ impl BladeAtlasState {
dimension: gpu::TextureDimension::D2,
usage,
});
let raw_view = self.gpu.create_texture_view(gpu::TextureViewDesc {
name: "",
texture: raw,
format,
dimension: gpu::ViewDimension::D2,
subresources: &Default::default(),
});
let raw_view = self.gpu.create_texture_view(
raw,
gpu::TextureViewDesc {
name: "",
format,
dimension: gpu::ViewDimension::D2,
subresources: &Default::default(),
},
);

let textures = &mut self.storage[kind];
let atlas_texture = BladeAtlasTexture {
Expand Down

0 comments on commit fb1cd7c

Please sign in to comment.