summaryrefslogtreecommitdiffstats
path: root/glow/src/quad.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-05-22 19:17:07 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-05-22 19:17:07 +0200
commitd6bf8955dbca03898e379aae376d91677bb4d223 (patch)
treeea40053bd51f0c4b02f40ec3b8f0e00b6d2271c0 /glow/src/quad.rs
parent1dd79c4697ce39589bea84142334b3cbd242fb59 (diff)
downloadiced-d6bf8955dbca03898e379aae376d91677bb4d223.tar.gz
iced-d6bf8955dbca03898e379aae376d91677bb4d223.tar.bz2
iced-d6bf8955dbca03898e379aae376d91677bb4d223.zip
Use published `glow` and `glow_glyph` versions
Diffstat (limited to 'glow/src/quad.rs')
-rw-r--r--glow/src/quad.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/glow/src/quad.rs b/glow/src/quad.rs
index a8fbb9e5..3a65338a 100644
--- a/glow/src/quad.rs
+++ b/glow/src/quad.rs
@@ -48,13 +48,13 @@ impl Pipeline {
let matrix: [f32; 16] = Transformation::identity().into();
gl.uniform_matrix_4_f32_slice(
- Some(&transform_location),
+ Some(transform_location),
false,
&matrix,
);
- gl.uniform_1_f32(Some(&scale_location), 1.0);
- gl.uniform_1_f32(Some(&screen_height_location), 0.0);
+ gl.uniform_1_f32(Some(scale_location), 1.0);
+ gl.uniform_1_f32(Some(screen_height_location), 0.0);
gl.use_program(None);
}
@@ -102,7 +102,7 @@ impl Pipeline {
unsafe {
let matrix: [f32; 16] = transformation.into();
gl.uniform_matrix_4_f32_slice(
- Some(&self.transform_location),
+ Some(self.transform_location),
false,
&matrix,
);
@@ -113,7 +113,7 @@ impl Pipeline {
if scale != self.current_scale {
unsafe {
- gl.uniform_1_f32(Some(&self.scale_location), scale);
+ gl.uniform_1_f32(Some(self.scale_location), scale);
}
self.current_scale = scale;
@@ -122,7 +122,7 @@ impl Pipeline {
if target_height != self.current_target_height {
unsafe {
gl.uniform_1_f32(
- Some(&self.screen_height_location),
+ Some(self.screen_height_location),
target_height as f32,
);
}