Merge pull request glium#1810 from adamnemecek/master

est31 · web-flow · commit e216a872e899 · 2019-12-25T20:16:48.000+01:00
trimmed whitespace
diff --git a/examples/displacement_mapping.rs b/examples/displacement_mapping.rs
@@ -31,7 +31,7 @@ fn main() {
 
         implement_vertex!(Vertex, position, tex_coords);
 
-        glium::VertexBuffer::new(&display, 
+        glium::VertexBuffer::new(&display,
             &[
                 Vertex { position: [-0.5,  0.5, 3.0], tex_coords: [1.0, 1.0] },
                 Vertex { position: [ 0.5,  0.5, 3.0], tex_coords: [0.0, 1.0] },
@@ -118,7 +118,7 @@ fn main() {
                     vec3 normal = normalize(gl_TessCoord.x * tc_normal[0] +
                                             gl_TessCoord.y * tc_normal[1] +
                                             gl_TessCoord.z * tc_normal[2]);
- 
+
                     vec2 tex_coords = gl_TessCoord.x * tc_tex_coords[0] +
                                       gl_TessCoord.y * tc_tex_coords[1] +
                                       gl_TessCoord.z * tc_tex_coords[2];
diff --git a/examples/fxaa.rs b/examples/fxaa.rs
@@ -80,8 +80,8 @@ mod fxaa {
                             #define FXAA_SPAN_MAX     8.0
 
                             vec4 fxaa(sampler2D tex, vec2 fragCoord, vec2 resolution,
-                                        vec2 v_rgbNW, vec2 v_rgbNE, 
-                                        vec2 v_rgbSW, vec2 v_rgbSE, 
+                                        vec2 v_rgbNW, vec2 v_rgbNE,
+                                        vec2 v_rgbSW, vec2 v_rgbSE,
                                         vec2 v_rgbM) {
                                 vec4 color;
                                 mediump vec2 inverseVP = vec2(1.0 / resolution.x, 1.0 / resolution.y);
@@ -99,19 +99,19 @@ mod fxaa {
                                 float lumaM  = dot(rgbM,  luma);
                                 float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
                                 float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
-                                
+
                                 mediump vec2 dir;
                                 dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
                                 dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
-                                
+
                                 float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) *
                                                       (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
-                                
+
                                 float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);
                                 dir = min(vec2(FXAA_SPAN_MAX, FXAA_SPAN_MAX),
                                           max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX),
                                           dir * rcpDirMin)) * inverseVP;
-                                
+
                                 vec3 rgbA = 0.5 * (
                                     texture2D(tex, fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz +
                                     texture2D(tex, fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz);
@@ -128,7 +128,7 @@ mod fxaa {
                             }
 
                             void main() {
-                                vec2 fragCoord = v_tex_coords * resolution; 
+                                vec2 fragCoord = v_tex_coords * resolution;
                                 vec4 color;
                                 if (enabled != 0) {
                                     vec2 inverseVP = 1.0 / resolution.xy;
@@ -206,7 +206,7 @@ mod fxaa {
             enabled: if enabled { 1i32 } else { 0i32 },
             resolution: (target_dimensions.0 as f32, target_dimensions.1 as f32)
         };
-        
+
         target.draw(&system.vertex_buffer, &system.index_buffer, &system.program, &uniforms,
                     &Default::default()).unwrap();
 
@@ -341,7 +341,7 @@ fn main() {
     let mut camera = support::camera::CameraState::new();
     let fxaa = fxaa::FxaaSystem::new(&display);
     let mut fxaa_enabled = true;
-    
+
     // the main loop
     support::start_loop(event_loop, move |events| {
         camera.update();
diff --git a/examples/image.rs b/examples/image.rs
@@ -34,7 +34,7 @@ fn main() {
 
         implement_vertex!(Vertex, position, tex_coords);
 
-        glium::VertexBuffer::new(&display, 
+        glium::VertexBuffer::new(&display,
             &[
                 Vertex { position: [-1.0, -1.0], tex_coords: [0.0, 0.0] },
                 Vertex { position: [-1.0,  1.0], tex_coords: [0.0, 1.0] },
@@ -79,7 +79,7 @@ fn main() {
             "
         },
 
-        110 => {  
+        110 => {
             vertex: "
                 #version 110
 
@@ -107,7 +107,7 @@ fn main() {
             ",
         },
 
-        100 => {  
+        100 => {
             vertex: "
                 #version 100
 
@@ -135,7 +135,7 @@ fn main() {
             ",
         },
     ).unwrap();
-    
+
     // the main loop
     support::start_loop(event_loop, move |events| {
         // building the uniforms
diff --git a/examples/info.rs b/examples/info.rs
@@ -45,7 +45,7 @@ fn main() {
              } else {
                  "none"
              });
-    
+
     println!("{} context renderer: {}", api, display.get_opengl_renderer_string());
     println!("{} context vendor: {}", api, display.get_opengl_vendor_string());
 }
diff --git a/examples/instancing.rs b/examples/instancing.rs
@@ -88,7 +88,7 @@ fn main() {
         .unwrap();
 
     let camera = support::camera::CameraState::new();
-    
+
     // the main loop
     support::start_loop(event_loop, move |events| {
         // updating the teapots
diff --git a/examples/picking.rs b/examples/picking.rs
@@ -236,7 +236,7 @@ fn main() {
                     glutin::event::WindowEvent::CloseRequested => action = support::Action::Stop,
                     glutin::event::WindowEvent::CursorMoved { position, .. } => {
                         let hidpi_factor = display.gl_window().window().hidpi_factor();
-                        cursor_position = Some(position.to_physical(hidpi_factor).into()); 
+                        cursor_position = Some(position.to_physical(hidpi_factor).into());
                     }
                     ev => camera.process_input(&ev),
                 },
diff --git a/examples/screenshot.rs b/examples/screenshot.rs
@@ -23,7 +23,7 @@ fn main() {
 
         implement_vertex!(Vertex, position, color);
 
-        glium::VertexBuffer::new(&display, 
+        glium::VertexBuffer::new(&display,
             &[
                 Vertex { position: [-0.5, -0.5], color: [0.0, 1.0, 0.0] },
                 Vertex { position: [ 0.0,  0.5], color: [0.0, 0.0, 1.0] },
@@ -66,7 +66,7 @@ fn main() {
             "
         },
 
-        110 => {  
+        110 => {
             vertex: "
                 #version 110
 
diff --git a/examples/teapot.rs b/examples/teapot.rs
@@ -124,7 +124,7 @@ fn main() {
 
     //
     let mut camera = support::camera::CameraState::new();
-    
+
     // the main loop
     support::start_loop(event_loop, move |events| {
         camera.update();
diff --git a/examples/tessellation.rs b/examples/tessellation.rs
@@ -23,7 +23,7 @@ fn main() {
 
         implement_vertex!(Vertex, position);
 
-        glium::VertexBuffer::new(&display, 
+        glium::VertexBuffer::new(&display,
             &[
                 Vertex { position: [-0.5, -0.5] },
                 Vertex { position: [ 0.0,  0.5] },
@@ -127,7 +127,7 @@ fn main() {
     // level of tessellation
     let mut tess_level: i32 = 5;
     println!("The current tessellation level is {} ; use the Up and Down keys to change it", tess_level);
-    
+
     // the main loop
     support::start_loop(event_loop, move |events| {
         // building the uniforms
diff --git a/examples/tutorial-12.rs b/examples/tutorial-12.rs
@@ -54,7 +54,7 @@ fn main() {
 
     let program = glium::Program::from_source(&display, vertex_shader_src, fragment_shader_src,
                                               None).unwrap();
-    
+
     event_loop.run(move |event, _, control_flow| {
         let next_frame_time = std::time::Instant::now() +
             std::time::Duration::from_nanos(16_666_667);
diff --git a/src/context/state.rs b/src/context/state.rs
@@ -389,7 +389,7 @@ impl Default for GlState {
             enabled_primitive_fixed_restart: false,
             enabled_program_point_size: false,
             enabled_clip_planes: 0,
-            
+
             program: Handle::Id(0),
             vertex_array: 0,
             clear_color: (0.0, 0.0, 0.0, 0.0),
diff --git a/src/draw_parameters/mod.rs b/src/draw_parameters/mod.rs
@@ -385,11 +385,11 @@ pub struct DrawParameters<'a> {
     /// Since this is purely an optimization, this parameter is ignored if the backend doesn't
     /// support it.
     pub primitive_bounding_box: (Range<f32>, Range<f32>, Range<f32>, Range<f32>),
-    
-    /// If enabled, will split the index buffer (if any is used in the draw call) 
+
+    /// If enabled, will split the index buffer (if any is used in the draw call)
     /// at the MAX value of the IndexType (u8::MAX, u16::MAX or u32::MAX) and start a new primitive
-    /// of the same type ("primitive restarting"). Supported on > OpenGL 3.1 or OpenGL ES 3.0. 
-    /// If the backend does not support GL_PRIMITIVE_RESTART_FIXED_INDEX, an Error 
+    /// of the same type ("primitive restarting"). Supported on > OpenGL 3.1 or OpenGL ES 3.0.
+    /// If the backend does not support GL_PRIMITIVE_RESTART_FIXED_INDEX, an Error
     /// of type `FixedIndexRestartingNotSupported` will be returned.
     pub primitive_restart_index: bool,
 }
@@ -931,7 +931,7 @@ fn sync_primitive_restart_index(ctxt: &mut context::CommandContext,
                                 enabled: bool)
                                 -> Result<(), DrawError>
 {
-    // TODO: use GL_PRIMITIVE_RESTART (if possible) if 
+    // TODO: use GL_PRIMITIVE_RESTART (if possible) if
     // GL_PRIMITIVE_RESTART_FIXED_INDEX is not supported
     if ctxt.version >= &Version(Api::Gl, 3, 1)   || ctxt.version >= &Version(Api::GlEs, 3, 0) ||
     ctxt.extensions.gl_arb_es3_compatibility
@@ -950,7 +950,7 @@ fn sync_primitive_restart_index(ctxt: &mut context::CommandContext,
             return Err(DrawError::FixedIndexRestartingNotSupported);
         }
     }
-    
+
 
     Ok(())
 }
diff --git a/src/framebuffer/mod.rs b/src/framebuffer/mod.rs
@@ -238,7 +238,7 @@ impl<'a> SimpleFrameBuffer<'a> {
 
         let attachments = fbo::FramebufferAttachments::Regular(fbo::FramebufferSpecificAttachments {
             colors: if let Some(color) = color {
-                let mut v = SmallVec::new(); v.push((0, color)); v 
+                let mut v = SmallVec::new(); v.push((0, color)); v
             } else {
                 SmallVec::new()
             },
@@ -389,7 +389,7 @@ impl<'a> MultiOutputFrameBuffer<'a> {
     pub fn with_depth_buffer<F: ?Sized, D, I, A>(facade: &F, color_attachments: I, depth: D)
                                          -> Result<MultiOutputFrameBuffer<'a>, ValidationError>
         where F: Facade,
-              D: ToDepthAttachment<'a>, 
+              D: ToDepthAttachment<'a>,
               I: IntoIterator<Item = (&'a str, A)>,
               A: ToColorAttachment<'a>,
     {
diff --git a/src/ops/clear.rs b/src/ops/clear.rs
@@ -31,7 +31,7 @@ pub fn clear(context: &Context, framebuffer: Option<&ValidatedAttachments>,
             ctxt.state.color_mask = (1, 1, 1, 1);
             ctxt.gl.ColorMask(1, 1, 1, 1);
         }
-    
+
         if ctxt.version >= &Version(Api::Gl, 3, 0) || ctxt.extensions.gl_arb_framebuffer_srgb ||
            ctxt.extensions.gl_ext_framebuffer_srgb || ctxt.extensions.gl_ext_srgb_write_control
         {
diff --git a/src/program/raw.rs b/src/program/raw.rs
@@ -428,7 +428,7 @@ impl RawProgram {
             {
                 return false;
             }
-            
+
 
             if format.iter().any(|e| e.1 != elem.offset && e.0 == elem.name) {
                 return false;
diff --git a/src/uniforms/sampler.rs b/src/uniforms/sampler.rs
@@ -14,7 +14,7 @@ pub enum SamplerWrapFunction {
 
     /// Samples at coord `x + 1` map to coord `1`.
     Clamp,
-    
+
     /// Use texture border.
     BorderClamp,
 
diff --git a/src/version.rs b/src/version.rs
@@ -5,7 +5,7 @@ use gl;
 /// Describes a version.
 ///
 /// A version can only be compared to another version if they belong to the same API.
-/// For example, both `Version(Gl, 3, 0) >= Version(GlEs, 3, 0)` and `Version(GlEs, 3, 0) >= 
+/// For example, both `Version(Gl, 3, 0) >= Version(GlEs, 3, 0)` and `Version(GlEs, 3, 0) >=
 /// Version(Gl, 3, 0)` return `false`.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct Version(pub Api, pub u8, pub u8);
diff --git a/src/vertex/format.rs b/src/vertex/format.rs
@@ -152,7 +152,7 @@ pub enum AttributeType {
 impl AttributeType {
     /// Returns true if the backend supports this type of attribute.
     pub fn is_supported<C: ?Sized>(&self, caps: &C) -> bool where C: CapabilitiesSource {
-        match self {    
+        match self {
             &AttributeType::I8 | &AttributeType::I8I8 | &AttributeType::I8I8I8 |
             &AttributeType::I8I8I8I8 | &AttributeType::U8 | &AttributeType::U8U8 |
             &AttributeType::U8U8U8 | &AttributeType::U8U8U8U8 | &AttributeType::I16 |
@@ -162,7 +162,7 @@ impl AttributeType {
             &AttributeType::F32F32 | &AttributeType::F32F32F32 | &AttributeType::F32F32F32F32 |
             &AttributeType::F32x2x2 | &AttributeType::F32x2x3 | &AttributeType::F32x2x4 |
             &AttributeType::F32x3x2 | &AttributeType::F32x3x3 | &AttributeType::F32x3x4 |
-            &AttributeType::F32x4x2 | &AttributeType::F32x4x3 | &AttributeType::F32x4x4 => 
+            &AttributeType::F32x4x2 | &AttributeType::F32x4x3 | &AttributeType::F32x4x4 =>
             {
                 true
             },
@@ -201,7 +201,7 @@ impl AttributeType {
             &AttributeType::F16F16F16F16 |
             &AttributeType::F16x2x2 | &AttributeType::F16x2x3 | &AttributeType::F16x2x4 |
             &AttributeType::F16x3x2 | &AttributeType::F16x3x3 | &AttributeType::F16x3x4 |
-            &AttributeType::F16x4x2 | &AttributeType::F16x4x3 | &AttributeType::F16x4x4 => 
+            &AttributeType::F16x4x2 | &AttributeType::F16x4x3 | &AttributeType::F16x4x4 =>
             {
                 caps.get_version() >= &Version(Api::GlEs, 3, 0) ||
                 caps.get_version() >= &Version(Api::Gl, 4, 0) ||
diff --git a/tests/draw_parameters.rs b/tests/draw_parameters.rs
@@ -1308,7 +1308,7 @@ fn primitive_restart_index() {
         ]).unwrap()
     };
 
-    let index_buffer = glium::IndexBuffer::<u8>::new(&display, glium::index::PrimitiveType::LineStrip, 
+    let index_buffer = glium::IndexBuffer::<u8>::new(&display, glium::index::PrimitiveType::LineStrip,
                                                      &[0, 1, 255, 2, 3]).unwrap();
     let program = program!(&display,
         140 => {
@@ -1407,4 +1407,4 @@ fn primitive_restart_index() {
     }
 
     display.assert_no_error(None);
-}
+}
diff --git a/tests/texture_draw.rs b/tests/texture_draw.rs
@@ -98,7 +98,7 @@ macro_rules! unowned_draw_test {
                                                  glium::texture::MipmapsOption::NoMipmap,
                                                  empty_texture.get_texture_type())
             };
-            
+
             draw_and_validate!(display, program, texture, vb, ib, $rust_value);
         }
     );

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ fn main() {`
`45`	`45`	`} else {`
`46`	`46`	`"none"`
`47`	`47`	`});`
`48`		`-`
	`48`	`+`
`49`	`49`	`println!("{} context renderer: {}", api, display.get_opengl_renderer_string());`
`50`	`50`	`println!("{} context vendor: {}", api, display.get_opengl_vendor_string());`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ fn main() {`
`236`	`236`	`glutin::event::WindowEvent::CloseRequested => action = support::Action::Stop,`
`237`	`237`	`glutin::event::WindowEvent::CursorMoved { position, .. } => {`
`238`	`238`	`let hidpi_factor = display.gl_window().window().hidpi_factor();`
`239`		`- cursor_position = Some(position.to_physical(hidpi_factor).into());`
	`239`	`+ cursor_position = Some(position.to_physical(hidpi_factor).into());`
`240`	`240`	`}`
`241`	`241`	`ev => camera.process_input(&ev),`
`242`	`242`	`},`