Skip to content

Commit

Permalink
Fix running rerun with --all-features (rerun-io#262)
Browse files Browse the repository at this point in the history
* Remove --all-features from README.md

* Fix running rerun with --all-features
  • Loading branch information
emilk authored Nov 7, 2022
1 parent faf4117 commit aef1ca4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rustup set default-host aarch64-apple-darwin && rustup install 1.65
After running the setup above, you can build and install the Rerun Viewer with:

```sh
cargo install --path ./crates/rerun/ --all-features
cargo install --path ./crates/rerun/
```

You should now be able to run `rerun --help` in any terminal.
Expand Down
3 changes: 1 addition & 2 deletions crates/re_viewer/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,7 @@ impl eframe::App for App {
self.toasts.show(egui_ctx);

#[cfg(feature = "wgpu")]
{
let render_state = frame.wgpu_render_state().unwrap();
if let Some(render_state) = frame.wgpu_render_state() {
let paint_callback_resources =
&mut render_state.renderer.write().paint_callback_resources;
paint_callback_resources
Expand Down
3 changes: 1 addition & 2 deletions crates/re_viewer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ pub(crate) fn wgpu_options() -> egui_wgpu::WgpuConfiguration {

pub(crate) fn customize_eframe(cc: &eframe::CreationContext<'_>) -> crate::DesignTokens {
#[cfg(feature = "wgpu")]
{
if let Some(render_state) = &cc.wgpu_render_state {
use re_renderer::{config::RenderContextConfig, RenderContext};

let render_state = cc.wgpu_render_state.as_ref().unwrap();
let paint_callback_resources = &mut render_state.renderer.write().paint_callback_resources;

// TODO(andreas): Query used surface format from eframe/renderer.
Expand Down

0 comments on commit aef1ca4

Please sign in to comment.