From 424e1d3fda3c9e1764b567a3b05d33a9ed589fda Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 19 Jan 2022 22:04:53 -0300 Subject: Add `Shader` and `Version` to simplify and constrain `program::create` --- glow/src/quad.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'glow/src/quad.rs') diff --git a/glow/src/quad.rs b/glow/src/quad.rs index e965f3c9..d9f1c6ae 100644 --- a/glow/src/quad.rs +++ b/glow/src/quad.rs @@ -1,6 +1,7 @@ mod compatibility; mod core; +use crate::program; use crate::Transformation; use glow::HasContext; use iced_graphics::layer; @@ -15,12 +16,12 @@ pub enum Pipeline { impl Pipeline { pub fn new( gl: &glow::Context, - shader_version: &(String, String), + shader_version: &program::Version, ) -> Pipeline { - let version = gl.version(); + let gl_version = gl.version(); // OpenGL 3.0+ and OpenGL ES 3.0+ have instancing (which is what separates `core` from `compatibility`) - if version.major >= 3 { + if gl_version.major >= 3 { log::info!("Mode: core"); Pipeline::Core(core::Pipeline::new(gl, shader_version)) } else { -- cgit