MoonsideGames
/
MoonWorksGraphicsTests
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: MoonsideGames:98fffde693fdfa2b608651585cdddd7423a366e7
Branches Tags
MoonsideGames:compute_sprite_batch
MoonsideGames:refresh2
MoonsideGames:main
MoonsideGames:spritebatch
..
compare: MoonsideGames:28e0e1efb0d70ac7ea8c44f2156efec2d0c7cefc
Branches Tags
MoonsideGames:compute_sprite_batch
MoonsideGames:refresh2
MoonsideGames:main
MoonsideGames:spritebatch

No commits in common. "98fffde693fdfa2b608651585cdddd7423a366e7" and "28e0e1efb0d70ac7ea8c44f2156efec2d0c7cefc" have entirely different histories.
98fffde693 ... 28e0e1efb0

29 changed files with 39 additions and 41 deletions
Show Stats Expand all files Collapse all files

8
BasicCompute/BasicComputeGame.cs
View File

@ -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("FillTextureCompute.spv")
);
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("CalculateSquaresCompute.spv")
);
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("TexturedQuadVert.spv")
);
ShaderModule fragShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("TexturedQuadFrag")
TestUtils.GetShaderPath("TexturedQuadFrag.spv")
);
GraphicsPipelineCreateInfo drawPipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

4
BasicTriangle/BasicTriangleGame.cs
View File

@ -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("RawTriangleVertices.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv"));
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(
MainWindow.SwapchainFormat,

4
CompressedTextures/CompressedTexturesGame.cs
View File

@ -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("TexturedQuadVert.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv"));
// Create the graphics pipeline
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

6
ComputeUniforms/ComputeUniformsGame.cs
View File

@ -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("GradientTextureCompute.spv")
);
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("TexturedQuadVert.spv")
);
ShaderModule fragShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("TexturedQuadFrag")
TestUtils.GetShaderPath("TexturedQuadFrag.spv")
);
GraphicsPipelineCreateInfo drawPipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

4
CopyTexture/CopyTextureGame.cs
View File

@ -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"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag"));
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv"));
// Create the graphics pipeline
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

12
Cube/CubeGame.cs
View File

@ -86,29 +86,29 @@ namespace MoonWorks.Test
{
ShaderModule cubeVertShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("PositionColorVertWithMatrix")
TestUtils.GetShaderPath("PositionColorVertWithMatrix.spv")
);
ShaderModule cubeFragShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("SolidColor")
TestUtils.GetShaderPath("SolidColor.spv")
);
ShaderModule skyboxVertShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("SkyboxVert")
TestUtils.GetShaderPath("SkyboxVert.spv")
);
ShaderModule skyboxFragShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("SkyboxFrag")
TestUtils.GetShaderPath("SkyboxFrag.spv")
);
ShaderModule blitVertShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("TexturedQuadVert")
TestUtils.GetShaderPath("TexturedQuadVert.spv")
);
ShaderModule blitFragShaderModule = new ShaderModule(
GraphicsDevice,
TestUtils.GetShaderPath("TexturedDepthQuadFrag")
TestUtils.GetShaderPath("TexturedDepthQuadFrag.spv")
);
depthTexture = Texture.CreateTexture2D(

4
CullFace/CullFaceGame.cs
View File

@ -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("PositionColorVert.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv"));
// Create the graphics pipelines
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

4
DrawIndirect/DrawIndirectGame.cs
View File

@ -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("PositionColorVert.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv"));
// Create the graphics pipeline
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

8
MSAA/MSAAGame.cs
View File

@ -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("RawTriangleVertices.spv"));
ShaderModule triangleFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv"));
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("TexturedQuadVert.spv"));
ShaderModule blitFragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv"));
pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(
MainWindow.SwapchainFormat,

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquaresCompute.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/FillTextureCompute.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTextureCompute.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVert.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorVertWithMatrix.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangleVertices.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxFrag.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/SkyboxVert.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/SolidColor.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuadFrag.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFrag.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadFragWithMultiplyColor.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVert.spv
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.refresh → MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadVertWithMatrix.spv
View File

Binary file not shown.

5
MoonWorks.Test.Common/Content/Shaders/compileShaders.ps1 Normal file
View File

@ -0,0 +1,5 @@
Get-ChildItem "Source" |
Foreach-Object {
$filename = $_.Basename
glslc $_.FullName -o Compiled/$filename.spv
}

7
MoonWorks.Test.Common/CopyMoonlibs.targets
View File

@ -40,11 +40,4 @@
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\moonlibs\video\**\*.*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

2
MoonWorks.Test.Common/TestUtils.cs
View File

@ -48,7 +48,7 @@ namespace MoonWorks.Test
public static string GetShaderPath(string shaderName)
{
return SDL2.SDL.SDL_GetBasePath() + "Content/Shaders/Compiled/" + shaderName + ".refresh";
return SDL2.SDL.SDL_GetBasePath() + "Content/Shaders/Compiled/" + shaderName;
}
public static string GetTexturePath(string textureName)

4
TexturedAnimatedQuad/TexturedAnimatedQuadGame.cs
View File

@ -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"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFragWithMultiplyColor"));
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVertWithMatrix.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFragWithMultiplyColor.spv"));
// Create the graphics pipeline
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

4
TexturedQuad/TexturedQuadGame.cs
View File

@ -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"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag"));
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadVert.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuadFrag.spv"));
// Create the graphics pipeline
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(

4
TriangleVertexBuffer/TriangleVertexBufferGame.cs
View File

@ -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("PositionColorVert.spv"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.spv"));
// Create the graphics pipeline
GraphicsPipelineCreateInfo pipelineCreateInfo = TestUtils.GetStandardGraphicsPipelineCreateInfo(