From ba2418145059edfbc59748c9b6c9b206d6353c96 Mon Sep 17 00:00:00 2001
From: chyyran <ronny@ronnychan.ca>
Date: Sat, 14 Jan 2023 01:58:22 -0500
Subject: [PATCH] test: fix tests

---
 librashader-runtime-d3d11/src/hello_triangle.rs      | 1 -
 librashader-runtime-gl/src/gl/gl3/hello_triangle.rs  | 6 +++---
 librashader-runtime-gl/src/gl/gl46/hello_triangle.rs | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/librashader-runtime-d3d11/src/hello_triangle.rs b/librashader-runtime-d3d11/src/hello_triangle.rs
index e99442d..2c55219 100644
--- a/librashader-runtime-d3d11/src/hello_triangle.rs
+++ b/librashader-runtime-d3d11/src/hello_triangle.rs
@@ -229,7 +229,6 @@ pub mod d3d11_hello_triangle {
 
     use crate::options::FilterChainOptionsD3D11;
     use crate::texture::D3D11InputView;
-    use crate::viewport::Viewport;
     use librashader_common::{Size, Viewport};
     use std::slice;
     use std::time::Instant;
diff --git a/librashader-runtime-gl/src/gl/gl3/hello_triangle.rs b/librashader-runtime-gl/src/gl/gl3/hello_triangle.rs
index 7df8ee2..11ae5f8 100644
--- a/librashader-runtime-gl/src/gl/gl3/hello_triangle.rs
+++ b/librashader-runtime-gl/src/gl/gl3/hello_triangle.rs
@@ -5,13 +5,13 @@ use std::sync::mpsc::Receiver;
 use glfw::{Context, Glfw, Window, WindowEvent};
 
 use gl::types::{GLchar, GLenum, GLint, GLsizei, GLuint};
-use librashader_common::Size;
+use librashader_common::{Size, Viewport};
 
 use crate::filter_chain::FilterChainGL;
+use crate::Framebuffer;
 use crate::framebuffer::GLImage;
 use crate::gl::gl3::CompatibilityGL;
 use crate::gl::{FramebufferInterface, GLInterface};
-use crate::viewport::Viewport;
 
 const WIDTH: u32 = 800;
 const HEIGHT: u32 = 600;
@@ -465,7 +465,7 @@ void main()
     let (fb_width, fb_height) = window.get_framebuffer_size();
     let (vp_width, vp_height) = window.get_size();
 
-    let output = <CompatibilityGL as GLInterface>::FramebufferInterface::new_from_raw(
+    let output = Framebuffer::new_from_raw(
         output_texture,
         output_framebuffer_handle,
         gl::RGBA8,
diff --git a/librashader-runtime-gl/src/gl/gl46/hello_triangle.rs b/librashader-runtime-gl/src/gl/gl46/hello_triangle.rs
index 7b89075..1f393eb 100644
--- a/librashader-runtime-gl/src/gl/gl46/hello_triangle.rs
+++ b/librashader-runtime-gl/src/gl/gl46/hello_triangle.rs
@@ -5,13 +5,13 @@ use std::sync::mpsc::Receiver;
 use glfw::{Context, Glfw, Window, WindowEvent};
 
 use gl::types::{GLchar, GLenum, GLint, GLsizei, GLuint};
-use librashader_common::Size;
+use librashader_common::{Size, Viewport};
 
 use crate::filter_chain::FilterChainGL;
+use crate::Framebuffer;
 use crate::framebuffer::GLImage;
 use crate::gl::gl46::DirectStateAccessGL;
 use crate::gl::{FramebufferInterface, GLInterface};
-use crate::viewport::Viewport;
 
 const WIDTH: u32 = 800;
 const HEIGHT: u32 = 600;
@@ -456,7 +456,7 @@ void main()
     let (fb_width, fb_height) = window.get_framebuffer_size();
     let (vp_width, vp_height) = window.get_size();
 
-    let output = <DirectStateAccessGL as GLInterface>::FramebufferInterface::new_from_raw(
+    let output = Framebuffer::new_from_raw(
         output_texture,
         output_framebuffer_handle,
         gl::RGBA8,