diff --git a/BasicCompute/BasicComputeGame.cs b/BasicCompute/BasicComputeGame.cs index 83d2791..cfe69a8 100644 --- a/BasicCompute/BasicComputeGame.cs +++ b/BasicCompute/BasicComputeGame.cs @@ -16,7 +16,7 @@ namespace MoonWorks.Test // Create the compute pipeline that writes texture data ShaderModule fillTextureComputeShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("FillTextureCompute.spv") + TestUtils.GetShaderPath("FillTextureCompute") ); ComputePipeline fillTextureComputePipeline = new ComputePipeline( @@ -27,7 +27,7 @@ namespace MoonWorks.Test // Create the compute pipeline that calculates squares of numbers ShaderModule calculateSquaresComputeShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("CalculateSquaresCompute.spv") + TestUtils.GetShaderPath("CalculateSquaresCompute") ); ComputePipeline calculateSquaresComputePipeline = new ComputePipeline( @@ -38,12 +38,12 @@ namespace MoonWorks.Test // Create the graphics pipeline ShaderModule vertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadVert.spv") + TestUtils.GetShaderPath("TexturedQuadVert") ); ShaderModule fragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadFrag.spv") + TestUtils.GetShaderPath("TexturedQuadFrag") ); GraphicsPipelineCreateInfo drawPipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/BasicTriangle/BasicTriangleGame.cs b/BasicTriangle/BasicTriangleGame.cs index ec799d2..7bcd0ff 100644 --- a/BasicTriangle/BasicTriangleGame.cs +++ b/BasicTriangle/BasicTriangleGame.cs @@ -19,8 +19,8 @@ namespace MoonWorks.Test { Logger.LogInfo("Press Left to toggle wireframe mode\nPress Down to toggle small viewport\nPress Right to toggle scissor rect"); - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangleVertices.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangleVertices")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( MainWindow.SwapchainFormat, diff --git a/CompressedTextures/CompressedTexturesGame.cs b/CompressedTextures/CompressedTexturesGame.cs index c701d8f..9fe91b4 100644 --- a/CompressedTextures/CompressedTexturesGame.cs +++ b/CompressedTextures/CompressedTexturesGame.cs @@ -28,8 +28,8 @@ namespace MoonWorks.Test Logger.LogInfo("Setting texture to: " + textureNames[0]); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/ComputeUniforms/ComputeUniformsGame.cs b/ComputeUniforms/ComputeUniformsGame.cs index 70d66d1..a3204c6 100644 --- a/ComputeUniforms/ComputeUniformsGame.cs +++ b/ComputeUniforms/ComputeUniformsGame.cs @@ -28,7 +28,7 @@ namespace MoonWorks.Test // Create the compute pipeline that writes texture data ShaderModule gradientTextureComputeShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("GradientTextureCompute.spv") + TestUtils.GetShaderPath("GradientTextureCompute") ); ComputePipeline gradientTextureComputePipeline = new ComputePipeline( @@ -39,12 +39,12 @@ namespace MoonWorks.Test // Create the graphics pipeline ShaderModule vertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadVert.spv") + TestUtils.GetShaderPath("TexturedQuadVert") ); ShaderModule fragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadFrag.spv") + TestUtils.GetShaderPath("TexturedQuadFrag") ); GraphicsPipelineCreateInfo drawPipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/CopyTexture/CopyTextureGame.cs b/CopyTexture/CopyTextureGame.cs index 478f50c..6607dc0 100644 --- a/CopyTexture/CopyTextureGame.cs +++ b/CopyTexture/CopyTextureGame.cs @@ -17,8 +17,8 @@ namespace MoonWorks.Test public CopyTextureGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/Cube/CubeGame.cs b/Cube/CubeGame.cs index a7baba5..fd16c64 100644 --- a/Cube/CubeGame.cs +++ b/Cube/CubeGame.cs @@ -86,29 +86,29 @@ namespace MoonWorks.Test { ShaderModule cubeVertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("PositionColorVertWithMatrix.spv") + TestUtils.GetShaderPath("PositionColorVertWithMatrix") ); ShaderModule cubeFragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("SolidColor.spv") + TestUtils.GetShaderPath("SolidColor") ); ShaderModule skyboxVertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("SkyboxVert.spv") + TestUtils.GetShaderPath("SkyboxVert") ); ShaderModule skyboxFragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("SkyboxFrag.spv") + TestUtils.GetShaderPath("SkyboxFrag") ); ShaderModule blitVertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadVert.spv") + TestUtils.GetShaderPath("TexturedQuadVert") ); ShaderModule blitFragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedDepthQuadFrag.spv") + TestUtils.GetShaderPath("TexturedDepthQuadFrag") ); depthTexture = Texture.CreateTexture2D( diff --git a/CullFace/CullFaceGame.cs b/CullFace/CullFaceGame.cs index 93a9c18..3d8bf03 100644 --- a/CullFace/CullFaceGame.cs +++ b/CullFace/CullFaceGame.cs @@ -22,8 +22,8 @@ namespace MoonWorks.Test Logger.LogInfo("Press Down to toggle the winding order of the triangles (default is counter-clockwise)"); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVert.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); // Create the graphics pipelines GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/DrawIndirect/DrawIndirectGame.cs b/DrawIndirect/DrawIndirectGame.cs index e7611da..9979b51 100644 --- a/DrawIndirect/DrawIndirectGame.cs +++ b/DrawIndirect/DrawIndirectGame.cs @@ -14,8 +14,8 @@ namespace MoonWorks.Test public DrawIndirectGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVert.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/MSAA/MSAAGame.cs b/MSAA/MSAAGame.cs index 3b3e0b8..4b8ce7a 100644 --- a/MSAA/MSAAGame.cs +++ b/MSAA/MSAAGame.cs @@ -22,8 +22,8 @@ namespace MoonWorks.Test Logger.LogInfo("Setting sample count to: " + currentSampleCount); // Create the MSAA pipelines - ShaderModule triangleVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangleVertices.spv")); - ShaderModule triangleFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv")); + ShaderModule triangleVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangleVertices")); + ShaderModule triangleFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( TextureFormat.R8G8B8A8, @@ -37,8 +37,8 @@ namespace MoonWorks.Test } // Create the blit pipeline - ShaderModule blitVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert.spv")); - ShaderModule blitFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv")); + ShaderModule blitVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); + ShaderModule blitFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( MainWindow.SwapchainFormat, diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.refresh similarity index 82% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.refresh index 5492e6f..db1640d 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.refresh similarity index 83% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.refresh index 3f90d15..9cc0204 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.refresh similarity index 91% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.refresh index 43fe8c9..f4f0bcc 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.refresh similarity index 85% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.refresh index 35c29f8..5daef24 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.refresh similarity index 88% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.refresh index 8676f66..9e90d79 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.refresh similarity index 90% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.refresh index 68f5351..3b388c3 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.refresh similarity index 71% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.refresh index 1843fea..6cc78dd 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.refresh similarity index 89% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.refresh index d7d0dda..22abe51 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.refresh similarity index 69% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.refresh index 2c37cf6..ce21468 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.refresh similarity index 89% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.refresh index e64dcd4..cf9fe9e 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.refresh similarity index 71% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.refresh index f3a7af5..0b955c1 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.refresh similarity index 82% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.refresh index 0c4dc46..079835c 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.refresh similarity index 83% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.refresh index 1b444a6..e57c13c 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.spv b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.refresh similarity index 86% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.spv rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.refresh index 95270cd..ba7f4e1 100644 Binary files a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.spv and b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.refresh differ diff --git a/MoonWorks.Test.Common/Content/Shaders/compileShaders.ps1 b/MoonWorks.Test.Common/Content/Shaders/compileShaders.ps1 deleted file mode 100644 index aa16bf5..0000000 --- a/MoonWorks.Test.Common/Content/Shaders/compileShaders.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -Get-ChildItem "Source" | -Foreach-Object { - $filename = $_.Basename - glslc $_.FullName -o Compiled/$filename.spv -} diff --git a/MoonWorks.Test.Common/TestUtils.cs b/MoonWorks.Test.Common/TestUtils.cs index 6783ac6..e1b931e 100644 --- a/MoonWorks.Test.Common/TestUtils.cs +++ b/MoonWorks.Test.Common/TestUtils.cs @@ -48,7 +48,7 @@ namespace MoonWorks.Test public static string GetShaderPath(string shaderName) { - return SDL2.SDL.SDL_GetBasePath() + "Content/Shaders/Compiled/" + shaderName; + return SDL2.SDL.SDL_GetBasePath() + "Content/Shaders/Compiled/" + shaderName + ".refresh"; } public static string GetTexturePath(string textureName) diff --git a/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs b/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs index 9905ff4..0d069b1 100644 --- a/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs +++ b/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs @@ -40,8 +40,8 @@ namespace MoonWorks.Test public TexturedAnimatedQuadGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVertWithMatrix.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFragWithMultiplyColor.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVertWithMatrix")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFragWithMultiplyColor")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/TexturedQuad/TexturedQuadGame.cs b/TexturedQuad/TexturedQuadGame.cs index aa6c592..ed27092 100644 --- a/TexturedQuad/TexturedQuadGame.cs +++ b/TexturedQuad/TexturedQuadGame.cs @@ -29,8 +29,8 @@ namespace MoonWorks.Test Logger.LogInfo("Setting sampler state to: " + samplerNames[0]); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/TriangleVertexBuffer/TriangleVertexBufferGame.cs b/TriangleVertexBuffer/TriangleVertexBufferGame.cs index 287bbd1..9896ac2 100644 --- a/TriangleVertexBuffer/TriangleVertexBufferGame.cs +++ b/TriangleVertexBuffer/TriangleVertexBufferGame.cs @@ -12,8 +12,8 @@ namespace MoonWorks.Test public TriangleVertexBufferGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVert.spv")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(