From ae3ee344b322d7d1adf511a3d1eae02c578266ea Mon Sep 17 00:00:00 2001
From: Joshua Groves <josh@joshgroves.com>
Date: Mon, 6 Apr 2020 22:12:13 -0230
Subject: [PATCH] wip

---
 examples/shadow/bake.frag.spv    | Bin 0 -> 180 bytes
 examples/shadow/bake.vert.spv    | Bin 0 -> 1312 bytes
 examples/shadow/forward.frag.spv | Bin 0 -> 4612 bytes
 examples/shadow/forward.vert.spv | Bin 0 -> 1948 bytes
 examples/shadow/main.rs          |  30 ++++++++++++------------------
 5 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 examples/shadow/bake.frag.spv
 create mode 100644 examples/shadow/bake.vert.spv
 create mode 100644 examples/shadow/forward.frag.spv
 create mode 100644 examples/shadow/forward.vert.spv

diff --git a/examples/shadow/bake.frag.spv b/examples/shadow/bake.frag.spv
new file mode 100644
index 0000000000000000000000000000000000000000..dbd293829162151b6ac404866890ba941bf278c9
GIT binary patch
literal 180
zcmZQ(Qf6mhU}Rut;9y{5fB-=TCZGrd12<3vM7#S0`{)&yr0AKL8h}*rF))KDupB=F
zD+3FV4Z^vJnRy^_0iZmH4>TCaVg{PVz;Fm?5J)AmI$@v;NKO%~iUG_v1F8avfz*Kj
S$fh4a5mq4m7igme5CZ_i&<h3t

literal 0
HcmV?d00001

diff --git a/examples/shadow/bake.vert.spv b/examples/shadow/bake.vert.spv
new file mode 100644
index 0000000000000000000000000000000000000000..26f1000fddfaddd480e9ef0bcf3de4eefd0ddaa3
GIT binary patch
literal 1312
zcmYk4TWb?x5QaY!lT@p%wf3OaxM}rDC|;-tq9|3;i(V88^)f`e$jZ7an++cRh5jUe
zl{bRVv&k1SWjZtOymR<w({3H~Lbw!qVI@2aGua3&kPucwx3R;Mvy;O~eR25Y>0=pd
zq1_PWtW&96M!$@+LjO8?A8qs3!v2BSfw9c#(0i5Kr+jppR_AF|r{4)dXSlw(a+1|q
zS%CH$zB3y<E9$fCXDTn|oJH;^&%VCRCiS@Zm@aZ|Y;Kz8i(H5O+*NVE4eT&4KaBGU
zb=@X5Hyxd4>9^CW{4B2>HU$xDcChb?I;(%UN2iI+O-Jv`D!*7@?mZnHm3dh;J#I@v
z?BT7(J{5Zm;$4(zBW4dVZNz-DnD2|2zL@tOlF^rUJbxoDQ)YbMtQ^ct(<5Sj*&C=m
z#OyJohwtA<l^73ZVKc*<C~-!NmuEyQ&Tw}z-zM)h>Rhon*PA(4j&qIUTx0LpN0m*g
ztQ*k7d+2ZDb+HM$1K-)k-f4^fE7$~89?jz`_|DrSzKWGE*2nX%v4=S|fp-n-O!F`1
zvA;7h=d589)V|I!UPqN(VsCC=_v%yS?ZxbU6YE>V>}~A#5Ho*k?#u5Jd%xJv{O&w2
zZoRR0wBDQC!@7^N<$F)}6qj%8oyE-it$dgJKI0qO$67`FFNnW`H~e?EE!2H|?@O5O
zwvCEM&K-PrTISp(7XM8jYxYp<#O>pL3F>YovHJ|r1pP&g@jhyuxU<~-0qVDL)+;tP
LmiLbrK1crphS^Qc

literal 0
HcmV?d00001

diff --git a/examples/shadow/forward.frag.spv b/examples/shadow/forward.frag.spv
new file mode 100644
index 0000000000000000000000000000000000000000..bc571bb9bcf4478d82df32a94a8ad2ad9b28cdd0
GIT binary patch
literal 4612
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

literal 0
HcmV?d00001

diff --git a/examples/shadow/forward.vert.spv b/examples/shadow/forward.vert.spv
new file mode 100644
index 0000000000000000000000000000000000000000..9bd02dfae3d0d07909d3d1c8ba557d06fb346247
GIT binary patch
literal 1948
zcmZ9MX-^YT6oxO|Kv5Bq#jQ@MJ6bnDlxQSq%7+GPNbuvNN`qsj9W$Nc@-O^L{wlwi
z_&zgpO64|Z&N=Tr+kNkaVxd0i+=QESQ*P5`Yt|KnI5+JoscyFRT8%++&{$o2M8r8)
zOaqCTai>$eq;Ibi^l?r}s*;<MJCeteqJ9PG-%2XGl77eWWg+Ao`MXiv>x44Xm^0FE
z`$>@eaGIp-@L5CuLllPxBaAtQ{&o~bv7(BaFI&`Qj?RB|%jsN4emfcjNf2pb=3&kb
zm~>f{A4(sFe!Cm*cjKh{U9Qj!$7at8RKy<f%#q?jKiLa@c8Rk+&aS=fF!=f=7$lwk
zr|xJEHrX47;b@O@z#EJCo=P{v=wl}wq;uf2hW>ug{nn17FWG$H86UgDUMo2KoD7s-
zbZcp}YN(do573T$<F%an$2`~boE=rL7(Etuek_h&#J!d@)rUCFN+0fFSwf8YHQ6kD
z?gp`a-pjbpo#3;W0ghSInHpi_gP|>s8NlGyFl;d19<x%9I5;pqjRW(?IWTOT1LJ#~
z12E$N-r<17nemN-IYkjy(=5z}y&$V1?MW6DPcMA-J^53)4ZfNC+$a0Q^Vdi`XI#>k
z^Mc`5_2qsHquyEh^aZCLKKBMTFMmeblT1ifa-aKWkv}U<EH&wOQJUFoo~yE{L4V?}
zNmC1)e)x9h%zs@z@pj%Dxy>1f$LF1}Z~43vYBKMAX-~ppUi=4=tY^tJWWx_wRTgi+
zIAafCPX5u+gMIqoXaC1Co}b94w(-iH!vQ$?tJ3fSPCh<&54Ntij3$>wpFcu)dt3U#
z=>-Y*0M{=SN$oia_<O}L^L&m;xp#UQ@V+1cM_8PjUY4^cn>yf@vm_fFVV%smB#a#D
zSk7hH;0Vid+TxTqa7Dr_)FzfQaOa+c`=$<eU6XjZNR8@5iswAb5@LSo%=mQ)wZUJB
zIo>{)@peo0N#1S?1GgFO%I3|`10L^5!03U$A|VHy9=ta&>#;7IyBxopXY#@6L5&Rw
cc~<keY+}Hv!#jQ<;Z0G8KKR7_6$=}Ze{L#sr2qf`

literal 0
HcmV?d00001

diff --git a/examples/shadow/main.rs b/examples/shadow/main.rs
index b3b794b6e..692bc3fbf 100644
--- a/examples/shadow/main.rs
+++ b/examples/shadow/main.rs
@@ -442,12 +442,10 @@ impl framework::Example for Example {
             });
 
             // Create the render pipeline
-            let vs_bytes =
-                framework::load_glsl(include_str!("bake.vert"), framework::ShaderStage::Vertex);
-            let fs_bytes =
-                framework::load_glsl(include_str!("bake.frag"), framework::ShaderStage::Fragment);
-            let vs_module = device.create_shader_module(&vs_bytes);
-            let fs_module = device.create_shader_module(&fs_bytes);
+            let vs_bytes = include_bytes!("bake.vert.spv");
+            let fs_bytes = include_bytes!("bake.frag.spv");
+            let vs_module = device.create_shader_module(&wgpu::read_spirv(std::io::Cursor::new(&vs_bytes[..])).unwrap());
+            let fs_module = device.create_shader_module(&wgpu::read_spirv(std::io::Cursor::new(&fs_bytes[..])).unwrap());
 
             let pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
                 layout: &pipeline_layout,
@@ -571,14 +569,10 @@ impl framework::Example for Example {
             });
 
             // Create the render pipeline
-            let vs_bytes =
-                framework::load_glsl(include_str!("forward.vert"), framework::ShaderStage::Vertex);
-            let fs_bytes = framework::load_glsl(
-                include_str!("forward.frag"),
-                framework::ShaderStage::Fragment,
-            );
-            let vs_module = device.create_shader_module(&vs_bytes);
-            let fs_module = device.create_shader_module(&fs_bytes);
+            let vs_bytes = include_bytes!("forward.vert.spv");
+            let fs_bytes = include_bytes!("forward.frag.spv");
+            let vs_module = device.create_shader_module(&wgpu::read_spirv(std::io::Cursor::new(&vs_bytes[..])).unwrap());
+            let fs_module = device.create_shader_module(&wgpu::read_spirv(std::io::Cursor::new(&fs_bytes[..])).unwrap());
 
             let pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
                 layout: &pipeline_layout,
@@ -706,7 +700,7 @@ impl framework::Example for Example {
 
         {
             let size = mem::size_of::<EntityUniforms>();
-            let temp_buf_data = device.create_buffer_mapped(&wgpu::BufferDescriptor {
+            let mut temp_buf_data = device.create_buffer_mapped(&wgpu::BufferDescriptor {
                 size: (self.entities.len() * size) as u64,
                 usage: wgpu::BufferUsage::COPY_SRC,
                 label: None,
@@ -716,7 +710,7 @@ impl framework::Example for Example {
             for (entity, slot) in self
                 .entities
                 .iter_mut()
-                .zip(temp_buf_data.data.chunks_exact_mut(size))
+                .zip(temp_buf_data.data().chunks_exact_mut(size))
             {
                 if entity.rotation_speed != 0.0 {
                     let rotation =
@@ -754,7 +748,7 @@ impl framework::Example for Example {
             self.lights_are_dirty = false;
             let size = mem::size_of::<LightRaw>();
             let total_size = size * self.lights.len();
-            let temp_buf_data = device.create_buffer_mapped(&wgpu::BufferDescriptor {
+            let mut temp_buf_data = device.create_buffer_mapped(&wgpu::BufferDescriptor {
                 size: total_size as u64,
                 usage: wgpu::BufferUsage::COPY_SRC,
                 label: None
@@ -763,7 +757,7 @@ impl framework::Example for Example {
             for (light, slot) in self
                 .lights
                 .iter()
-                .zip(temp_buf_data.data.chunks_exact_mut(size))
+                .zip(temp_buf_data.data().chunks_exact_mut(size))
             {
                 slot.copy_from_slice(light.to_raw().as_bytes());
             }