Skip to content

Commit

Permalink
Merge #195
Browse files Browse the repository at this point in the history
195: support wasm32-unknown-emscripten r=grovesNL a=caiiiycuk

Related to #189
To support `wasm32-unknown-emscripten` no need to do anything special like c api. It just works as is, because emscripten emulates OpenGL ES 3.0, so just disabling web path for it works fine (tested on vange-rs project)

Co-authored-by: Alexander Guryanov <caiiiycuk@gmail.com>
  • Loading branch information
bors[bot] and caiiiycuk authored Dec 7, 2021
2 parents f351993 + 5abe786 commit b6eb0ba
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ use std::collections::HashSet;

mod version;

#[cfg(not(target_arch = "wasm32"))]
#[cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))]
mod native;
#[cfg(not(target_arch = "wasm32"))]
#[cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))]
pub use native::*;
#[cfg(not(target_arch = "wasm32"))]
#[cfg(any(not(target_arch = "wasm32"), target_os = "emscripten"))]
mod gl46;

#[cfg(target_arch = "wasm32")]
#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
#[path = "web_sys.rs"]
mod web;
#[cfg(target_arch = "wasm32")]
#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
pub use web::*;

pub type Shader = <Context as HasContext>::Shader;
Expand Down

0 comments on commit b6eb0ba

Please sign in to comment.