me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add Shader and Version

Browse source 
to simplify and constrain `program::create`
This commit is contained in:
Richard 2022-01-19 22:04:53 -03:00
parent 230db88fb2
commit 424e1d3fda
6 changed files with 157 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

34
glow/src/quad/compatibility.rs
View file

@ -1,4 +1,4 @@
use crate::program;
use crate::program::{self, Shader};
use crate::Transformation;
use glow::HasContext;
use iced_graphics::layer;
@ -27,29 +27,23 @@ pub struct Pipeline {
impl Pipeline {
pub fn new(
gl: &glow::Context,
(vertex_version, fragment_version): &(String, String),
shader_version: &program::Version,
) -> Pipeline {
let program = unsafe {
let vertex_shader = Shader::vertex(
gl,
shader_version,
include_str!("../shader/compatibility/quad.vert"),
);
let fragment_shader = Shader::fragment(
gl,
shader_version,
include_str!("../shader/compatibility/quad.frag"),
);
program::create(
gl,
&[
(
glow::VERTEX_SHADER,
&format!(
"{}\n{}",
vertex_version,
include_str!("../shader/compatibility/quad.vert")
),
),
(
glow::FRAGMENT_SHADER,
&format!(
"{}\n{}",
fragment_version,
include_str!("../shader/compatibility/quad.frag")
),
),
],
&[vertex_shader, fragment_shader],
&[
(0, "i_Pos"),
(1, "i_Scale"),

34
glow/src/quad/core.rs
View file

@ -1,4 +1,4 @@
use crate::program;
use crate::program::{self, Shader};
use crate::Transformation;
use glow::HasContext;
use iced_graphics::layer;
@ -22,29 +22,23 @@ pub struct Pipeline {
impl Pipeline {
pub fn new(
gl: &glow::Context,
(vertex_version, fragment_version): &(String, String),
shader_version: &program::Version,
) -> Pipeline {
let program = unsafe {
let vertex_shader = Shader::vertex(
gl,
shader_version,
include_str!("../shader/core/quad.vert"),
);
let fragment_shader = Shader::fragment(
gl,
shader_version,
include_str!("../shader/core/quad.frag"),
);
program::create(
gl,
&[
(
glow::VERTEX_SHADER,
&format!(
"{}\n{}",
vertex_version,
include_str!("../shader/core/quad.vert")
),
),
(
glow::FRAGMENT_SHADER,
&format!(
"{}\n{}",
fragment_version,
include_str!("../shader/core/quad.frag")
),
),
],
&[vertex_shader, fragment_shader],
&[
(0, "i_Pos"),
(1, "i_Scale"),