From 8f7d8cf27ec35ea08ff8e6376e52e8b56ad9218b Mon Sep 17 00:00:00 2001
From: Joshua Groves <josh@joshgroves.com>
Date: Mon, 6 Apr 2020 00:05:44 -0230
Subject: [PATCH] [rs] Get mipmap mostly working

Subresource tracking for mip levels isn't available in Canary yet, so
we can't verify that the web example output matches native
---
 wgpu/examples/mipmap/blit.frag.spv | Bin 0 -> 708 bytes
 wgpu/examples/mipmap/blit.vert.spv | Bin 0 -> 1348 bytes
 wgpu/examples/mipmap/draw.frag.spv | Bin 0 -> 684 bytes
 wgpu/examples/mipmap/draw.vert.spv | Bin 0 -> 1244 bytes
 wgpu/examples/mipmap/main.rs       |  28 ++++++++++++++--------------
 5 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 wgpu/examples/mipmap/blit.frag.spv
 create mode 100644 wgpu/examples/mipmap/blit.vert.spv
 create mode 100644 wgpu/examples/mipmap/draw.frag.spv
 create mode 100644 wgpu/examples/mipmap/draw.vert.spv

diff --git a/wgpu/examples/mipmap/blit.frag.spv b/wgpu/examples/mipmap/blit.frag.spv
new file mode 100644
index 0000000000000000000000000000000000000000..ff08dac769279e3b6e62a4464bc7ef0d70d435e9
GIT binary patch
literal 708
zcmYk3%}WAN6vb~&qn71ImZm|dEdyy$5kzfVxN(<6yFpMQs2+?%^!N2wwFx@EtJYk&
zbKg1d+^;uL;jCn~WhE<H*H+fBf*7-k6+Mn850l|Cn-4FqE>Ki0av_?UGPf1+x7o`(
z7d!Hnye=KQ8t4?Ms@a#4VzGIBEQXwrOlRryBGb_|dx}{y3a=q`To+#c;n;h8B-6#`
zD1>xwHda;YoXRmUH3p9UaX*KtnZE~f&u-+i$EIFW8?Zy)w=qArbS{eP$=lMiE13Oy
z`j!=WE%@6tW=6P<rrlLUPrtlvFf}Uc3$)Y#vlrIY6jeoZHD~xgD;=19uoHDWP^1QP
z9xBq8eaJmhq$fN*!0ZlpE{yhAj$P|-kjIV~yL^j@74O8-V_(jUVCHGandMO`=4i^%
hz@wpWTTag>y%z7)k)wmBAN}vujrZg3N7LQNe*x6vB3=Lh

literal 0
HcmV?d00001

diff --git a/wgpu/examples/mipmap/blit.vert.spv b/wgpu/examples/mipmap/blit.vert.spv
new file mode 100644
index 0000000000000000000000000000000000000000..d4dd66b0745df3102ea5861f68d17270d3057f78
GIT binary patch
literal 1348
zcmYk6U279j5QdM5Nz`gTtgV7l6Kk!uHGWkQM5|PYLN6i}Z%b(wS%`@ws|2qE@BLB!
zDHRcXp4~k)CroGNedo-_nKaePY9oXbp%G4n?NFSBPyq>HCe(A?+1uZ1kF#ET`{7+9
zW<xa(G-i%_o|DLj!*rlMi(Ez4kt&}G`Uk-^qNd|&aHrw2Be{Bh?|uK^T{6m&$?HKc
znTXf&T%Ql#CX?OaaMUYe*SJS)HyIV-xMZjYagW?^oM!280NTiL`_1umknN{m65}Fg
zk8r#F^yABPoE;91l4H(k<v#WM$DF-8pQpoA&OC!`l)m$?Af8vu5c@L56S3l*-N1j$
zUW~JDjMEnL{W>t_Gj5T;>K2$W+RIpVbQ8JA4HlgHa!q_UCZ=rS8+!)vY|*Q@wZxPq
zV$PzQh<%#lTxp9xDSh8SKIUA)4&m!g%(;vwX3mIRDlzehT`pt9tmQj8n|)bJ-}e=B
zz82aUd>ebchHfGrd(mG-?ClEvb+qwfD_Fi|%ps>(_XgS;^48T~FER5v`%T0XXWl5>
z=h1H${*L+XW1G)fk9cSIVb31%Um!KKwcL^a8_xU;R@<FCE$hx<``$m{E}%Vsh!Btd
zJhn40Al5pMSZ5KjmVC_ZZhnJ#SI#?;b4Syhc_L>|)10{@=N_jybKAc&H4$er)?MmH
z?iRM(_wu{Ai7n>ac1vsv+wX_+t;B9)8!Pt)%pKoB#61!7M@-DO>C#OLeGf5K&YhX}
W1v%W=1H`?%Yx~tV{x2CGBmV$!zgENm

literal 0
HcmV?d00001

diff --git a/wgpu/examples/mipmap/draw.frag.spv b/wgpu/examples/mipmap/draw.frag.spv
new file mode 100644
index 0000000000000000000000000000000000000000..57d41137679dd4b19bcf840cdcecd848b9236b16
GIT binary patch
literal 684
zcmYk3O-q7N5QT5rtCr<QmS#by?WILU5VdjP#$8fN5tIn37gVC(*RN_5^gLHBFO2h^
zGw05kxn?ux`4F~3J`_STEKfCLU_vN{T+IE!!=O7~OuCm>7b;328-;4h+}tJ`Z{wGD
z3p+%esGyU_fUhiFL-^uS0=ubCV7!x#hU3}ubirrT?2#9vUizBOBCdeve>jOAAEV*)
zvzMl`NeF$q+UJb$i0#pd=pVPi&TieFn{}~uXSMDg>wYy@`F7l9sj2gwgKH5D^zJHl
zzZSm*vacn7yTZ;W*JRpVvU=y)JZo%^;;Nw59%A?MoG?*|tgajx|DUB!>^`1T91qC$
zaLz-rzV74QBeI_IdWhX!?wZ$E=T07H|AtA(cd+){C!9&Ff0fYt5tY6*LXEr{eHw%w
VPiTCfV?v$$JubeJ+z(US5Wm<?A@cwL

literal 0
HcmV?d00001

diff --git a/wgpu/examples/mipmap/draw.vert.spv b/wgpu/examples/mipmap/draw.vert.spv
new file mode 100644
index 0000000000000000000000000000000000000000..d8128ba45b53d862c090d0e80454788fdbadb1b7
GIT binary patch
literal 1244
zcmYk4U279j5Qa~arctY{we~};>89}u3dIW*K~zeG^dexO#oG|tRTk2$B&ihdyz8z1
zz~ADp@<#A^cJ~xdc$t}Z-ZMKhIrUnn8Nys>hHK$jD9=i$!Gy3F77E+#9rgC6v(vp7
zFQ2Pe3iU#$W|@1Qd2lw&#`@R6O>iI7`PHz$5jRl%uWP`l{WdsGFAnm2a$0J<I~?@$
zDYiimo7gX-K|h^*N++}Qf)KXk_08qeY?kF?*k+-(w}Q{cv!m>LsxId2hupy^`}!f9
z&W7WY^eX3M=FUf>t6YN_oW<h|Eo?788IEYsK8!u*gX76?JpG(c&d}9EQm`R(x#OHs
zXY7nIK1A(|p2gCH$T^3cHgfhaXRnddmvg^eGS*XfSoMp`S4w^SZby=1jmYsB!fjv;
zIcwN&g53e07`MwXtfEra=8k>nuj4IX6R^R3>l&L&h<!C`<=<4XJCaj>1FPP7)W;pj
zt2cIsb6}TP?J@}A*M5xe6mfXJMt%)HDdR$Kybip-MScTo4Y?Mc`-?r86ZUZrYmesb
z!?=9sfp5%*2gC`mu6-D90naA!L#%b3t3@SuENAU)toxC(ws8XD&f1k9^-qZH#d@#!
z57k-MBmW1+|NJeinp?n~ePrwIeW~K)J@(w^MtlSAQ(RWu3ch!IA5pi8@1DhvN_Q7u
zt+{t};{PhQPu>}JKmy#0y*W<@$j4qE;oIv^?%4Zdphn(0&i)j*d+YceV|9O-<TdyQ
DpH)hP

literal 0
HcmV?d00001

diff --git a/wgpu/examples/mipmap/main.rs b/wgpu/examples/mipmap/main.rs
index 1364cdee16..437c6334a7 100644
--- a/wgpu/examples/mipmap/main.rs
+++ b/wgpu/examples/mipmap/main.rs
@@ -105,12 +105,12 @@ impl Example {
             bind_group_layouts: &[&bind_group_layout],
         });
 
-        let vs_bytes =
-            framework::load_glsl(include_str!("blit.vert"), framework::ShaderStage::Vertex);
-        let fs_bytes =
-            framework::load_glsl(include_str!("blit.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!("blit.vert.spv");
+        let fs_bytes = include_bytes!("blit.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,
@@ -153,7 +153,7 @@ impl Example {
             mag_filter: wgpu::FilterMode::Linear,
             min_filter: wgpu::FilterMode::Nearest,
             mipmap_filter: wgpu::FilterMode::Nearest,
-            lod_min_clamp: -100.0,
+            lod_min_clamp: 0.0,
             lod_max_clamp: 100.0,
             compare: wgpu::CompareFunction::Undefined,
         });
@@ -299,7 +299,7 @@ impl framework::Example for Example {
             mag_filter: wgpu::FilterMode::Linear,
             min_filter: wgpu::FilterMode::Linear,
             mipmap_filter: wgpu::FilterMode::Linear,
-            lod_min_clamp: -100.0,
+            lod_min_clamp: 0.0,
             lod_max_clamp: 100.0,
             compare: wgpu::CompareFunction::Undefined,
         });
@@ -334,12 +334,12 @@ impl framework::Example for Example {
         });
 
         // Create the render pipeline
-        let vs_bytes =
-            framework::load_glsl(include_str!("draw.vert"), framework::ShaderStage::Vertex);
-        let fs_bytes =
-            framework::load_glsl(include_str!("draw.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!("draw.vert.spv");
+        let fs_bytes = include_bytes!("draw.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 draw_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
             layout: &pipeline_layout,