From 3f94dcf62144174eb3484a2dd6ecb2c673f1bce2 Mon Sep 17 00:00:00 2001 From: Ram Kaniyur Date: Sat, 11 Jan 2020 12:55:51 +1100 Subject: [PATCH] [rs] Accept DOS line endings in examples/boids --- wgpu/examples/boids/main.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wgpu/examples/boids/main.rs b/wgpu/examples/boids/main.rs index 0064d03db1..cd1af6eed5 100644 --- a/wgpu/examples/boids/main.rs +++ b/wgpu/examples/boids/main.rs @@ -6,6 +6,7 @@ extern crate rand; #[path = "../framework.rs"] mod framework; +use std::fmt::Write; use zerocopy::{AsBytes}; @@ -40,13 +41,13 @@ impl framework::Example for Example { // loads comp shader source and adds shared constants as defines to comp shader - let mut boids_source_str = String::from(include_str!("boids.comp")); - let version_header_str = "#version 450\n"; - assert!(boids_source_str.starts_with(version_header_str)); - boids_source_str.insert_str(version_header_str.len(), - &format!("#define NUM_PARTICLES {}\n#define PARTICLES_PER_GROUP {}\n", - NUM_PARTICLES, PARTICLES_PER_GROUP)); + const BOIDS_SOURCE: &str = include_str!("boids.comp"); + const HEADER: &str = "#version 450"; + assert_eq!(BOIDS_SOURCE.lines().next(), Some(HEADER)); + let mut boids_source_str = String::from(HEADER); + write!(boids_source_str, "\n#define NUM_PARTICLES {}\n#define PARTICLES_PER_GROUP {}", NUM_PARTICLES, PARTICLES_PER_GROUP).unwrap(); + boids_source_str += &BOIDS_SOURCE[HEADER.len()..]; // load (and compile) shaders and create shader modules