Merge pull request #2473 from Kitware/webgpu_update_june132022

martinken · web-flow · commit 2f13cf33e4f7 · 2022-06-13T14:38:50.000-04:00
chore(WebGPU): update to latest spec. Simple syntax changes
diff --git a/Sources/Rendering/WebGPU/CellArrayMapper/index.js b/Sources/Rendering/WebGPU/CellArrayMapper/index.js
@@ -28,7 +28,7 @@ const vtkWebGPUPolyDataVS = `
 
 //VTK::IOStructs::Dec
 
-@stage(vertex)
+@vertex
 fn main(
 //VTK::IOStructs::Input
 )
@@ -70,7 +70,7 @@ const vtkWebGPUPolyDataFS = `
 
 //VTK::IOStructs::Dec
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/ImageMapper/index.js b/Sources/Rendering/WebGPU/ImageMapper/index.js
@@ -30,7 +30,7 @@ const imgFragTemplate = `
 
 //VTK::IOStructs::Dec
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/OrderIndependentTranslucentPass/index.js b/Sources/Rendering/WebGPU/OrderIndependentTranslucentPass/index.js
@@ -16,7 +16,7 @@ const oitpFragTemplate = `
 
 //VTK::IOStructs::Dec
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/Renderer/index.js b/Sources/Rendering/WebGPU/Renderer/index.js
@@ -20,7 +20,7 @@ const clearFragTemplate = `
 
 //VTK::IOStructs::Dec
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/SimpleMapper/index.js b/Sources/Rendering/WebGPU/SimpleMapper/index.js
@@ -21,7 +21,7 @@ const vtkWebGPUSimpleMapperVS = `
 
 //VTK::IOStructs::Dec
 
-@stage(vertex)
+@vertex
 fn main(
 //VTK::IOStructs::Input
 )
@@ -62,7 +62,7 @@ const vtkWebGPUSimpleMapperFS = `
 
 //VTK::IOStructs::Dec
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/SphereMapper/index.js b/Sources/Rendering/WebGPU/SphereMapper/index.js
@@ -18,7 +18,7 @@ const vtkWebGPUSphereMapperVS = `
 
 //VTK::IOStructs::Dec
 
-@stage(vertex)
+@vertex
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/StickMapper/index.js b/Sources/Rendering/WebGPU/StickMapper/index.js
@@ -38,7 +38,7 @@ const vtkWebGPUStickMapperVS = `
 
 //VTK::IOStructs::Dec
 
-@stage(vertex)
+@vertex
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/VolumePass/index.js b/Sources/Rendering/WebGPU/VolumePass/index.js
@@ -62,7 +62,7 @@ const DepthBoundsFS = `
 
 //VTK::IOStructs::Dec
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )
@@ -96,7 +96,7 @@ const volumeCopyFragTemplate = `
 
 //VTK::IOStructs::Dec
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )
diff --git a/Sources/Rendering/WebGPU/VolumePassFSQ/index.js b/Sources/Rendering/WebGPU/VolumePassFSQ/index.js
@@ -351,7 +351,7 @@ fn composite(rayLengthSC: f32, minPosSC: vec4<f32>, rayStepSC: vec4<f32>) -> vec
   return computedColor;
 }
 
-@stage(fragment)
+@fragment
 fn main(
 //VTK::IOStructs::Input
 )

Original file line number	Diff line number	Diff line change
@@ -28,7 +28,7 @@ const vtkWebGPUPolyDataVS = `
`28`	`28`
`29`	`29`	`//VTK::IOStructs::Dec`
`30`	`30`
`31`		`-@stage(vertex)`
	`31`	`+@vertex`
`32`	`32`	`fn main(`
`33`	`33`	`//VTK::IOStructs::Input`
`34`	`34`	`)`
@@ -70,7 +70,7 @@ const vtkWebGPUPolyDataFS = `
`70`	`70`
`71`	`71`	`//VTK::IOStructs::Dec`
`72`	`72`
`73`		`-@stage(fragment)`
	`73`	`+@fragment`
`74`	`74`	`fn main(`
`75`	`75`	`//VTK::IOStructs::Input`
`76`	`76`	`)`
Original file line number	Diff line number	Diff line change
@@ -30,7 +30,7 @@ const imgFragTemplate = `
`30`	`30`
`31`	`31`	`//VTK::IOStructs::Dec`
`32`	`32`
`33`		`-@stage(fragment)`
	`33`	`+@fragment`
`34`	`34`	`fn main(`
`35`	`35`	`//VTK::IOStructs::Input`
`36`	`36`	`)`
Original file line number	Diff line number	Diff line change
@@ -16,7 +16,7 @@ const oitpFragTemplate = `
`16`	`16`
`17`	`17`	`//VTK::IOStructs::Dec`
`18`	`18`
`19`		`-@stage(fragment)`
	`19`	`+@fragment`
`20`	`20`	`fn main(`
`21`	`21`	`//VTK::IOStructs::Input`
`22`	`22`	`)`
Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ const clearFragTemplate = `
`20`	`20`
`21`	`21`	`//VTK::IOStructs::Dec`
`22`	`22`
`23`		`-@stage(fragment)`
	`23`	`+@fragment`
`24`	`24`	`fn main(`
`25`	`25`	`//VTK::IOStructs::Input`
`26`	`26`	`)`
Original file line number	Diff line number	Diff line change
@@ -21,7 +21,7 @@ const vtkWebGPUSimpleMapperVS = `
`21`	`21`
`22`	`22`	`//VTK::IOStructs::Dec`
`23`	`23`
`24`		`-@stage(vertex)`
	`24`	`+@vertex`
`25`	`25`	`fn main(`
`26`	`26`	`//VTK::IOStructs::Input`
`27`	`27`	`)`
@@ -62,7 +62,7 @@ const vtkWebGPUSimpleMapperFS = `
`62`	`62`
`63`	`63`	`//VTK::IOStructs::Dec`
`64`	`64`
`65`		`-@stage(fragment)`
	`65`	`+@fragment`
`66`	`66`	`fn main(`
`67`	`67`	`//VTK::IOStructs::Input`
`68`	`68`	`)`
Original file line number	Diff line number	Diff line change
@@ -18,7 +18,7 @@ const vtkWebGPUSphereMapperVS = `
`18`	`18`
`19`	`19`	`//VTK::IOStructs::Dec`
`20`	`20`
`21`		`-@stage(vertex)`
	`21`	`+@vertex`
`22`	`22`	`fn main(`
`23`	`23`	`//VTK::IOStructs::Input`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
@@ -38,7 +38,7 @@ const vtkWebGPUStickMapperVS = `
`38`	`38`
`39`	`39`	`//VTK::IOStructs::Dec`
`40`	`40`
`41`		`-@stage(vertex)`
	`41`	`+@vertex`
`42`	`42`	`fn main(`
`43`	`43`	`//VTK::IOStructs::Input`
`44`	`44`	`)`
Original file line number	Diff line number	Diff line change
@@ -62,7 +62,7 @@ const DepthBoundsFS = `
`62`	`62`
`63`	`63`	`//VTK::IOStructs::Dec`
`64`	`64`
`65`		`-@stage(fragment)`
	`65`	`+@fragment`
`66`	`66`	`fn main(`
`67`	`67`	`//VTK::IOStructs::Input`
`68`	`68`	`)`
@@ -96,7 +96,7 @@ const volumeCopyFragTemplate = `
`96`	`96`
`97`	`97`	`//VTK::IOStructs::Dec`
`98`	`98`
`99`		`-@stage(fragment)`
	`99`	`+@fragment`
`100`	`100`	`fn main(`
`101`	`101`	`//VTK::IOStructs::Input`
`102`	`102`	`)`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ fn composite(rayLengthSC: f32, minPosSC: vec4<f32>, rayStepSC: vec4<f32>) -> vec`
`351`	`351`	`return computedColor;`
`352`	`352`	`}`
`353`	`353`
`354`		`-@stage(fragment)`
	`354`	`+@fragment`
`355`	`355`	`fn main(`
`356`	`356`	`//VTK::IOStructs::Input`
`357`	`357`	`)`