From 6071a21904581231bbb8b23a0c6fe6bcbdbbb592 Mon Sep 17 00:00:00 2001
From: ice_iix <ice_ix@protonmail.ch>
Date: Sun, 27 Dec 2020 09:27:26 -0800
Subject: [PATCH] Update to glow release, remove image_2d_sample()

---
 Cargo.lock        |  5 +++--
 Cargo.toml        |  2 +-
 src/gl/mod.rs     | 34 +---------------------------------
 src/render/mod.rs |  1 +
 4 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff686da..32486f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
diff --git a/Cargo.toml b/Cargo.toml
index f1350db..0198057 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
diff --git a/src/gl/mod.rs b/src/gl/mod.rs
index ee5f7c6..c8bb8a5 100644
--- a/src/gl/mod.rs
+++ b/src/gl/mod.rs
@@ -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,
diff --git a/src/render/mod.rs b/src/render/mod.rs
index fb67f58..6c9ad7a 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -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(