diff --git a/lib/MoonWorks b/lib/MoonWorks
index 32b2695..7328cbc 160000
--- a/lib/MoonWorks
+++ b/lib/MoonWorks
@@ -1 +1 @@
-Subproject commit 32b269526f6e24f695dece00871fec0c5812ca20
+Subproject commit 7328cbc13dc0e1f156689aeeae2fd5ae4be24084
diff --git a/src/TestGame.cs b/src/TestGame.cs
index e2fe31d..dffef9a 100644
--- a/src/TestGame.cs
+++ b/src/TestGame.cs
@@ -70,11 +70,7 @@ namespace MoonWorksComputeSpriteBatch
 
 			MultisampleState multisampleState = MultisampleState.None;
 
-			GraphicsPipelineLayoutInfo pipelineLayoutInfo = new GraphicsPipelineLayoutInfo
-			{
-				VertexSamplerBindingCount = 0,
-				FragmentSamplerBindingCount = 1
-			};
+			GraphicsPipelineLayoutInfo pipelineLayoutInfo = new GraphicsPipelineLayoutInfo(0, 1);
 
 			RasterizerState rasterizerState = RasterizerState.CCW_CullNone;
 
@@ -119,35 +115,7 @@ namespace MoonWorksComputeSpriteBatch
 				VertexAttributes = vertexAttributes
 			};
 
-			var viewports = new Viewport[1]
-			{
-				new Viewport
-				{
-					X = 0,
-					Y = 0,
-					W = windowWidth,
-					H = windowHeight,
-					MinDepth = 0,
-					MaxDepth = 1
-				}
-			};
-
-			var scissors = new Rect[1]
-			{
-				new Rect
-				{
-					X = 0,
-					Y = 0,
-					W = (int) windowWidth,
-					H = (int) windowHeight
-				}
-			};
-
-			ViewportState viewportState = new ViewportState
-			{
-				Viewports = viewports,
-				Scissors = scissors
-			};
+			ViewportState viewportState = new ViewportState((int)windowWidth, (int)windowHeight);
 
 			var colorAttachmentDescriptions = new ColorAttachmentDescription[1]
 			{