Skip to content

Commit 851f6f0

Browse files
committed
#301 Fixes wasm32-unknown-unknown build
1 parent 4e44276 commit 851f6f0

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

bracket-terminal/src/hal/gl_common/framebuffer.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#[allow(unused_imports)]
22
use crate::BResult;
3-
use glow::{HasContext, NativeFramebuffer, NativeTexture};
3+
use glow::HasContext;
4+
5+
use super::{FramebufferId, TextureId};
46

57
#[cfg(not(target_arch = "wasm32"))]
68
pub struct Framebuffer {
7-
fbo: NativeFramebuffer,
8-
pub texture: NativeTexture,
9+
fbo: FramebufferId,
10+
pub texture: TextureId,
911
}
1012

1113
#[cfg(target_arch = "wasm32")]
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use glow::{NativeTexture, NativeBuffer, NativeVertexArray, NativeProgram};
1+
use glow::{NativeTexture, NativeBuffer, NativeVertexArray, NativeProgram, NativeFramebuffer};
22

33
pub type TextureId = NativeTexture;
44
pub type BufferId = NativeBuffer;
55
pub type VertexArrayId = NativeVertexArray;
66
pub type ShaderId = NativeProgram;
7+
pub type FramebufferId = NativeFramebuffer;

bracket-terminal/src/hal/gl_common/types_wasm.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ pub type TextureId = glow::WebTextureKey;
22
pub type BufferId = glow::WebBufferKey;
33
pub type VertexArrayId = glow::WebVertexArrayKey;
44
pub type ShaderId = glow::WebProgramKey;
5+
pub type FramebufferId = glow::WebFramebufferKey;

bracket-terminal/src/hal/wasm/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub struct InitHints {
1818
pub fullscreen: bool,
1919
pub frame_sleep_time: Option<f32>,
2020
pub desired_gutter: u32,
21+
pub fitscreen: bool,
2122
}
2223

2324
impl InitHints {
@@ -27,6 +28,7 @@ impl InitHints {
2728
fullscreen: false,
2829
frame_sleep_time: None,
2930
desired_gutter: 0,
31+
fitscreen: false,
3032
}
3133
}
3234
}

0 commit comments

Comments
 (0)