diff --git a/BasicCompute/BasicComputeGame.cs b/BasicCompute/BasicComputeGame.cs index 45efb11..bb73377 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") + TestUtils.GetShaderPath("FillTexture.comp") ); 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") + TestUtils.GetShaderPath("CalculateSquares.comp") ); ComputePipeline calculateSquaresComputePipeline = new ComputePipeline( @@ -38,12 +38,12 @@ namespace MoonWorks.Test // Create the graphics pipeline ShaderModule vertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadVert") + TestUtils.GetShaderPath("TexturedQuad.vert") ); ShaderModule fragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadFrag") + TestUtils.GetShaderPath("TexturedQuad.frag") ); GraphicsPipelineCreateInfo drawPipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/BasicStencil/BasicStencilGame.cs b/BasicStencil/BasicStencilGame.cs index e902d46..f6c80ff 100644 --- a/BasicStencil/BasicStencilGame.cs +++ b/BasicStencil/BasicStencilGame.cs @@ -14,8 +14,8 @@ namespace MoonWorks.Test public BasicStencilGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); // Create the graphics pipelines GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/BasicTriangle/BasicTriangleGame.cs b/BasicTriangle/BasicTriangleGame.cs index 7bcd0ff..2b15e51 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")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangle.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( MainWindow.SwapchainFormat, diff --git a/CompressedTextures/CompressedTexturesGame.cs b/CompressedTextures/CompressedTexturesGame.cs index e66ceea..e1f7a00 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")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/ComputeUniforms/ComputeUniformsGame.cs b/ComputeUniforms/ComputeUniformsGame.cs index 6d43e6c..e9af0ae 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") + TestUtils.GetShaderPath("GradientTexture.comp") ); ComputePipeline gradientTextureComputePipeline = new ComputePipeline( @@ -39,12 +39,12 @@ namespace MoonWorks.Test // Create the graphics pipeline ShaderModule vertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadVert") + TestUtils.GetShaderPath("TexturedQuad.vert") ); ShaderModule fragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadFrag") + TestUtils.GetShaderPath("TexturedQuad.frag") ); GraphicsPipelineCreateInfo drawPipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/CopyTexture/CopyTextureGame.cs b/CopyTexture/CopyTextureGame.cs index 7cea2af..7f1a69e 100644 --- a/CopyTexture/CopyTextureGame.cs +++ b/CopyTexture/CopyTextureGame.cs @@ -18,8 +18,8 @@ namespace MoonWorks.Test public unsafe CopyTextureGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/Cube/CubeGame.cs b/Cube/CubeGame.cs index 8db40ed..5316031 100644 --- a/Cube/CubeGame.cs +++ b/Cube/CubeGame.cs @@ -68,29 +68,29 @@ namespace MoonWorks.Test { ShaderModule cubeVertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("PositionColorVertWithMatrix") + TestUtils.GetShaderPath("PositionColorWithMatrix.vert") ); ShaderModule cubeFragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("SolidColor") + TestUtils.GetShaderPath("SolidColor.frag") ); ShaderModule skyboxVertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("SkyboxVert") + TestUtils.GetShaderPath("Skybox.vert") ); ShaderModule skyboxFragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("SkyboxFrag") + TestUtils.GetShaderPath("Skybox.frag") ); ShaderModule blitVertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedQuadVert") + TestUtils.GetShaderPath("TexturedQuad.vert") ); ShaderModule blitFragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("TexturedDepthQuadFrag") + TestUtils.GetShaderPath("TexturedDepthQuad.frag") ); depthTexture = Texture.CreateTexture2D( diff --git a/CullFace/CullFaceGame.cs b/CullFace/CullFaceGame.cs index 0504b70..f901137 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")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); // Create the graphics pipelines GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/DepthMSAA/DepthMSAAGame.cs b/DepthMSAA/DepthMSAAGame.cs index a5417c6..cc879bd 100644 --- a/DepthMSAA/DepthMSAAGame.cs +++ b/DepthMSAA/DepthMSAAGame.cs @@ -33,11 +33,11 @@ namespace MoonWorks.Test // Create the cube pipelines ShaderModule cubeVertShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("PositionColorVertWithMatrix") + TestUtils.GetShaderPath("PositionColorWithMatrix.vert") ); ShaderModule cubeFragShaderModule = new ShaderModule( GraphicsDevice, - TestUtils.GetShaderPath("SolidColor") + TestUtils.GetShaderPath("SolidColor.frag") ); GraphicsPipelineCreateInfo pipelineCreateInfo = new GraphicsPipelineCreateInfo @@ -65,8 +65,8 @@ namespace MoonWorks.Test } // Create the blit pipeline - ShaderModule blitVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); - ShaderModule blitFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule blitVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule blitFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( MainWindow.SwapchainFormat, diff --git a/DrawIndirect/DrawIndirectGame.cs b/DrawIndirect/DrawIndirectGame.cs index df41be6..0232681 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")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/InstancingAndOffsets/InstancingAndOffsetsGame.cs b/InstancingAndOffsets/InstancingAndOffsetsGame.cs index abff15a..9ad497b 100644 --- a/InstancingAndOffsets/InstancingAndOffsetsGame.cs +++ b/InstancingAndOffsets/InstancingAndOffsetsGame.cs @@ -18,8 +18,8 @@ namespace MoonWorks.Test Logger.LogInfo("Press Left to toggle vertex offset\nPress Right to toggle index offset"); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorVertInstanced")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColorInstanced.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/MSAA/MSAAGame.cs b/MSAA/MSAAGame.cs index c64797e..f32e67b 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")); - ShaderModule triangleFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule triangleVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangle.vert")); + ShaderModule triangleFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); 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")); - ShaderModule blitFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule blitVertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule blitFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( MainWindow.SwapchainFormat, diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquares.comp.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquares.comp.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/FillTexture.comp.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/FillTexture.comp.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTexture.comp.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTexture.comp.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColor.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColor.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertInstanced.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorInstanced.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertInstanced.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorInstanced.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorWithMatrix.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorWithMatrix.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionSamplerVert.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/PositionSampler.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/PositionSamplerVert.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/PositionSampler.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangle.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangle.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/Skybox.frag.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/Skybox.frag.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/Skybox.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/Skybox.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.frag.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.frag.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuad.frag.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuad.frag.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad.frag.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad.frag.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad3DFrag.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad3D.frag.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad3DFrag.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad3D.frag.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadWithMatrix.vert.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadWithMatrix.vert.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.refresh b/MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadWithMultiplyColor.frag.refresh similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.refresh rename to MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadWithMultiplyColor.frag.refresh diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/CalculateSquaresCompute.comp b/MoonWorks.Test.Common/Content/Shaders/Source/CalculateSquares.comp similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/CalculateSquaresCompute.comp rename to MoonWorks.Test.Common/Content/Shaders/Source/CalculateSquares.comp diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/FillTextureCompute.comp b/MoonWorks.Test.Common/Content/Shaders/Source/FillTexture.comp similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/FillTextureCompute.comp rename to MoonWorks.Test.Common/Content/Shaders/Source/FillTexture.comp diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/GradientTextureCompute.comp b/MoonWorks.Test.Common/Content/Shaders/Source/GradientTexture.comp similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/GradientTextureCompute.comp rename to MoonWorks.Test.Common/Content/Shaders/Source/GradientTexture.comp diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/PositionColorVert.vert b/MoonWorks.Test.Common/Content/Shaders/Source/PositionColor.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/PositionColorVert.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/PositionColor.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/PositionColorVertInstanced.vert b/MoonWorks.Test.Common/Content/Shaders/Source/PositionColorInstanced.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/PositionColorVertInstanced.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/PositionColorInstanced.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/PositionColorVertWithMatrix.vert b/MoonWorks.Test.Common/Content/Shaders/Source/PositionColorWithMatrix.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/PositionColorVertWithMatrix.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/PositionColorWithMatrix.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/PositionSamplerVert.vert b/MoonWorks.Test.Common/Content/Shaders/Source/PositionSampler.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/PositionSamplerVert.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/PositionSampler.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/RawTriangleVertices.vert b/MoonWorks.Test.Common/Content/Shaders/Source/RawTriangle.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/RawTriangleVertices.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/RawTriangle.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/SkyboxFrag.frag b/MoonWorks.Test.Common/Content/Shaders/Source/Skybox.frag similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/SkyboxFrag.frag rename to MoonWorks.Test.Common/Content/Shaders/Source/Skybox.frag diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/SkyboxVert.vert b/MoonWorks.Test.Common/Content/Shaders/Source/Skybox.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/SkyboxVert.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/Skybox.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/TexturedDepthQuadFrag.frag b/MoonWorks.Test.Common/Content/Shaders/Source/TexturedDepthQuad.frag similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/TexturedDepthQuadFrag.frag rename to MoonWorks.Test.Common/Content/Shaders/Source/TexturedDepthQuad.frag diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadFrag.frag b/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad.frag similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadFrag.frag rename to MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad.frag diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadVert.vert b/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadVert.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad3DFrag.frag b/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad3D.frag similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad3DFrag.frag rename to MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuad3D.frag diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadVertWithMatrix.vert b/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadWithMatrix.vert similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadVertWithMatrix.vert rename to MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadWithMatrix.vert diff --git a/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadFragWithMultiplyColor.frag b/MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadWithMultiplyColor.frag similarity index 100% rename from MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadFragWithMultiplyColor.frag rename to MoonWorks.Test.Common/Content/Shaders/Source/TexturedQuadWithMultiplyColor.frag diff --git a/RenderTexture3D/RenderTexture3DGame.cs b/RenderTexture3D/RenderTexture3DGame.cs index 4e175ce..3369fd4 100644 --- a/RenderTexture3D/RenderTexture3DGame.cs +++ b/RenderTexture3D/RenderTexture3DGame.cs @@ -34,8 +34,8 @@ namespace MoonWorks.Test public RenderTexture3DGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad3DFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad3D.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/RenderTextureCube/RenderTextureCubeGame.cs b/RenderTextureCube/RenderTextureCubeGame.cs index 4a27cd2..2b1d0e4 100644 --- a/RenderTextureCube/RenderTextureCubeGame.cs +++ b/RenderTextureCube/RenderTextureCubeGame.cs @@ -31,8 +31,8 @@ namespace MoonWorks.Test Logger.LogInfo("Press Down to view the other side of the cubemap"); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SkyboxVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SkyboxFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("Skybox.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("Skybox.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/RenderTextureMipmaps/RenderTextureMipmapsGame.cs b/RenderTextureMipmaps/RenderTextureMipmapsGame.cs index 0751c1f..842a137 100644 --- a/RenderTextureMipmaps/RenderTextureMipmapsGame.cs +++ b/RenderTextureMipmaps/RenderTextureMipmapsGame.cs @@ -49,8 +49,8 @@ namespace MoonWorks.Test Logger.LogInfo(GetSamplerString(currentSamplerIndex)); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVertWithMatrix")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadWithMatrix.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/Texture3D/Texture3DGame.cs b/Texture3D/Texture3DGame.cs index e5e49fe..ca945ff 100644 --- a/Texture3D/Texture3DGame.cs +++ b/Texture3D/Texture3DGame.cs @@ -30,8 +30,8 @@ namespace MoonWorks.Test Logger.LogInfo("Press Left and Right to cycle between depth slices"); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad3DFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad3D.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/TextureMipmaps/TextureMipmapsGame.cs b/TextureMipmaps/TextureMipmapsGame.cs index 66e4144..b1ea438 100644 --- a/TextureMipmaps/TextureMipmapsGame.cs +++ b/TextureMipmaps/TextureMipmapsGame.cs @@ -20,8 +20,8 @@ namespace MoonWorks.Test Logger.LogInfo("Press Left and Right to shrink/expand the scale of the quad"); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVertWithMatrix")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadWithMatrix.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs b/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs index 7582198..acea45f 100644 --- a/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs +++ b/TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs @@ -29,8 +29,8 @@ namespace MoonWorks.Test public TexturedAnimatedQuadGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVertWithMatrix")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFragWithMultiplyColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadWithMatrix.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadWithMultiplyColor.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/TexturedQuad/TexturedQuadGame.cs b/TexturedQuad/TexturedQuadGame.cs index 14c21de..2bb4550 100644 --- a/TexturedQuad/TexturedQuadGame.cs +++ b/TexturedQuad/TexturedQuadGame.cs @@ -50,8 +50,8 @@ namespace MoonWorks.Test Logger.LogInfo(qoiBytes.Length.ToString()); // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/TriangleVertexBuffer/TriangleVertexBufferGame.cs b/TriangleVertexBuffer/TriangleVertexBufferGame.cs index c1cd6a4..b3d4d11 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")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/VertexSampler/VertexSamplerGame.cs b/VertexSampler/VertexSamplerGame.cs index 453ba27..25c4baa 100644 --- a/VertexSampler/VertexSamplerGame.cs +++ b/VertexSampler/VertexSamplerGame.cs @@ -14,8 +14,8 @@ namespace MoonWorks.Test public VertexSamplerGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionSamplerVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionSampler.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/VideoPlayer/VideoPlayerGame.cs b/VideoPlayer/VideoPlayerGame.cs index 82c8224..9db3efd 100644 --- a/VideoPlayer/VideoPlayerGame.cs +++ b/VideoPlayer/VideoPlayerGame.cs @@ -17,8 +17,8 @@ namespace MoonWorks.Test public VideoPlayerGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { // Load the shaders - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.frag")); // Create the graphics pipeline GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( diff --git a/WindowResizing/WindowResizingGame.cs b/WindowResizing/WindowResizingGame.cs index b1fb778..2532892 100644 --- a/WindowResizing/WindowResizingGame.cs +++ b/WindowResizing/WindowResizingGame.cs @@ -22,8 +22,8 @@ namespace MoonWorks.Test public WindowResizingGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { - ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangleVertices")); - ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor")); + ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangle.vert")); + ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo( MainWindow.SwapchainFormat,