Update to glow release, remove image_2d_sample()

This commit is contained in:
ice_iix 2020-12-27 09:27:26 -08:00
parent 7826c2a5d0
commit 6071a21904
4 changed files with 6 additions and 36 deletions

5
Cargo.lock generated
View File

@ -790,8 +790,9 @@ dependencies = [
[[package]]
name = "glow"
version = "0.6.1"
source = "git+https://github.com/iceiix/glow?rev=b354346dee69ff0ca7ccef67f7580dfbb697423b#b354346dee69ff0ca7ccef67f7580dfbb697423b"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3eac04632dc8c047fb70d658f8479583e1bb084859f67a150227769a10fc161f"
dependencies = [
"js-sys",
"slotmap",

View File

@ -22,7 +22,7 @@ debug-assertions = true
cfg-if = "1.0.0"
wasm-bindgen = "0.2.69"
winit = { version = "0.24.0", features = [ "web-sys" ]}
glow = { git = "https://github.com/iceiix/glow", rev = "b354346dee69ff0ca7ccef67f7580dfbb697423b" }
glow = "0.7.1"
byteorder = "1.3.4"
serde = "1.0.118"
serde_json = "1.0.60"

View File

@ -14,7 +14,7 @@
use glow as gl;
use glow::{HasContext, PixelPackData, PixelUnpackData};
use log::{error, info};
use log::error;
use std::mem;
use std::ops::BitOr;
use std::ops::{Deref, DerefMut};
@ -369,38 +369,6 @@ impl Texture {
}
}
pub fn image_2d_sample(
&self,
target: TextureTarget,
samples: i32,
width: u32,
height: u32,
format: TextureFormat,
fixed: bool,
) {
unsafe {
let result: i32 = glow_context().get_parameter_i32(gl::MAX_SAMPLES);
let use_samples = if samples > result {
info!(
"glTexImage2DMultisample: requested {} samples but GL_MAX_SAMPLES is {}",
samples, result
);
result
} else {
samples
};
// TODO: switch to glRenderbufferStorageMultisample https://github.com/iceiix/stevenarella/pull/442
glow_context().tex_image_2d_multisample(
target,
use_samples,
format,
width as i32,
height as i32,
fixed,
);
}
}
pub fn image_3d(
&self,
target: TextureTarget,

View File

@ -843,6 +843,7 @@ impl TransInfo {
let main = gl::Framebuffer::new();
main.bind();
// TODO: support rendering to a multisample renderbuffer for MSAA, using glRenderbufferStorageMultisample
let fb_color = gl::Texture::new();
fb_color.bind(gl::TEXTURE_2D);
fb_color.image_2d(