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

start converting tests to be D3D11-compatibility

refresh2
cosmonaut 2024-03-06 00:15:44 -08:00
parent beacd05925
commit 5159442540
38 changed files with 84 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BasicCompute/BasicComputeGame.cs
View File

@ -11,7 +11,7 @@ namespace MoonWorks.Test
private Sampler sampler; private Sampler sampler;
private GpuBuffer vertexBuffer; private GpuBuffer vertexBuffer;
public BasicComputeGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public BasicComputeGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
// Create the compute pipeline that writes texture data // Create the compute pipeline that writes texture data
ShaderModule fillTextureComputeShaderModule = new ShaderModule( ShaderModule fillTextureComputeShaderModule = new ShaderModule(
@ -115,15 +115,12 @@ namespace MoonWorks.Test
cmdbuf.EndComputePass(); cmdbuf.EndComputePass();
cmdbuf.BeginCopyPass();
cmdbuf.DownloadFromBuffer(squaresBuffer, transferBuffer, TransferOptions.Overwrite);
cmdbuf.EndCopyPass();
var fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf); var fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf);
GraphicsDevice.WaitForFences(fence); GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence); GraphicsDevice.ReleaseFence(fence);
// Print the squares! // Print the squares!
GraphicsDevice.DownloadFromBuffer(squaresBuffer, transferBuffer, TransferOptions.Overwrite);
transferBuffer.GetData<uint>(squares, 0); transferBuffer.GetData<uint>(squares, 0);
Logger.LogInfo("Squares of the first " + squares.Length + " integers: " + string.Join(", ", squares)); Logger.LogInfo("Squares of the first " + squares.Length + " integers: " + string.Join(", ", squares));
} }

2
BasicStencil/BasicStencilGame.cs
View File

@ -11,7 +11,7 @@ namespace MoonWorks.Test
private GpuBuffer vertexBuffer; private GpuBuffer vertexBuffer;
private Texture depthStencilTexture; private Texture depthStencilTexture;
public BasicStencilGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public BasicStencilGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
// Load the shaders // Load the shaders
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert")); ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert"));

2
BasicTriangle/BasicTriangleGame.cs
View File

@ -14,7 +14,7 @@ namespace MoonWorks.Test
private bool useSmallViewport; private bool useSmallViewport;
private bool useScissorRect; private bool useScissorRect;
public BasicTriangleGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public BasicTriangleGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
Logger.LogInfo("Press Left to toggle wireframe mode\nPress Down to toggle small viewport\nPress Right to toggle scissor rect"); Logger.LogInfo("Press Left to toggle wireframe mode\nPress Down to toggle small viewport\nPress Right to toggle scissor rect");

2
ClearScreen/ClearScreenGame.cs
View File

@ -5,7 +5,7 @@ namespace MoonWorks.Test
{ {
class ClearScreenGame : Game class ClearScreenGame : Game
{ {
public ClearScreenGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) { } public ClearScreenGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true) { }
protected override void Update(System.TimeSpan delta) { } protected override void Update(System.TimeSpan delta) { }

7
ClearScreen_MultiWindow/ClearScreen_MultiWindowGame.cs
View File

@ -7,12 +7,17 @@ namespace MoonWorks.Test
{ {
private Window secondaryWindow; private Window secondaryWindow;
public ClearScreen_MultiWindowGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public ClearScreen_MultiWindowGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
var (windowX, windowY) = MainWindow.Position;
MainWindow.SetPosition(windowX - 360, windowY);
secondaryWindow = new Window( secondaryWindow = new Window(
new WindowCreateInfo("Secondary Window", 640, 480, ScreenMode.Windowed, PresentMode.FIFO, false, false), new WindowCreateInfo("Secondary Window", 640, 480, ScreenMode.Windowed, PresentMode.FIFO, false, false),
GraphicsDevice.WindowFlags GraphicsDevice.WindowFlags
); );
(windowX, windowY) = secondaryWindow.Position;
secondaryWindow.SetPosition(windowX + 360, windowY);
GraphicsDevice.ClaimWindow(secondaryWindow, PresentMode.FIFO); GraphicsDevice.ClaimWindow(secondaryWindow, PresentMode.FIFO);
} }

2
CompressedTextures/CompressedTexturesGame.cs
View File

@ -21,7 +21,7 @@ namespace MoonWorks.Test
private int currentTextureIndex; private int currentTextureIndex;
public CompressedTexturesGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public CompressedTexturesGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
Logger.LogInfo("Press Left and Right to cycle between textures"); Logger.LogInfo("Press Left and Right to cycle between textures");
Logger.LogInfo("Setting texture to: " + textureNames[0]); Logger.LogInfo("Setting texture to: " + textureNames[0]);

2
ComputeUniforms/ComputeUniformsGame.cs
View File

@ -23,7 +23,7 @@ namespace MoonWorks.Test
} }
} }
public ComputeUniformsGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public ComputeUniformsGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
// Create the compute pipeline that writes texture data // Create the compute pipeline that writes texture data
ShaderModule gradientTextureComputeShaderModule = new ShaderModule( ShaderModule gradientTextureComputeShaderModule = new ShaderModule(

27
CopyTexture/CopyTextureGame.cs
View File

@ -14,7 +14,7 @@ namespace MoonWorks.Test
private Texture textureSmallCopy; private Texture textureSmallCopy;
private Sampler sampler; private Sampler sampler;
public unsafe CopyTextureGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public unsafe CopyTextureGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
// Load the shaders // Load the shaders
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert"));
@ -115,22 +115,19 @@ namespace MoonWorks.Test
// Render the half-size copy // Render the half-size copy
cmdbuf.Blit(originalTexture, textureSmallCopy, Filter.Linear, WriteOptions.SafeOverwrite); cmdbuf.Blit(originalTexture, textureSmallCopy, Filter.Linear, WriteOptions.SafeOverwrite);
// Copy the texture to a transfer buffer
TransferBuffer compareBuffer = new TransferBuffer(GraphicsDevice, byteCount);
cmdbuf.BeginCopyPass();
cmdbuf.DownloadFromTexture(
originalTexture,
compareBuffer,
new BufferImageCopy(0, 0, 0),
TransferOptions.Overwrite
);
cmdbuf.EndCopyPass();
var fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf); var fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf);
GraphicsDevice.WaitForFences(fence); GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence); GraphicsDevice.ReleaseFence(fence);
// Copy the texture to a transfer buffer
TransferBuffer compareBuffer = new TransferBuffer(GraphicsDevice, byteCount);
GraphicsDevice.DownloadFromTexture(
textureCopy,
compareBuffer,
TransferOptions.Overwrite
);
// Compare the original bytes to the copied bytes. // Compare the original bytes to the copied bytes.
var copiedBytes = NativeMemory.Alloc(byteCount); var copiedBytes = NativeMemory.Alloc(byteCount);
var copiedSpan = new System.Span<byte>(copiedBytes, (int) byteCount); var copiedSpan = new System.Span<byte>(copiedBytes, (int) byteCount);
@ -140,12 +137,12 @@ namespace MoonWorks.Test
if (System.MemoryExtensions.SequenceEqual(originalSpan, copiedSpan)) if (System.MemoryExtensions.SequenceEqual(originalSpan, copiedSpan))
{ {
Logger.LogError("SUCCESS! Original texture bytes and the bytes from CopyTextureToBuffer match!"); Logger.LogError("SUCCESS! Original texture bytes and the downloaded bytes match!");
} }
else else
{ {
Logger.LogError("FAIL! Original texture bytes do not match bytes from CopyTextureToBuffer!"); Logger.LogError("FAIL! Original texture bytes do not match downloaded bytes!");
} }
RefreshCS.Refresh.Refresh_Image_Free(pixels); RefreshCS.Refresh.Refresh_Image_Free(pixels);

30
Cube/CubeGame.cs
View File

@ -26,6 +26,7 @@ namespace MoonWorks.Test
private TransferBuffer screenshotTransferBuffer; private TransferBuffer screenshotTransferBuffer;
private Texture screenshotTexture; private Texture screenshotTexture;
private Fence? screenshotFence;
private Texture skyboxTexture; private Texture skyboxTexture;
private Sampler skyboxSampler; private Sampler skyboxSampler;
@ -38,6 +39,7 @@ namespace MoonWorks.Test
private Vector3 camPos = new Vector3(0, 1.5f, 4f); private Vector3 camPos = new Vector3(0, 1.5f, 4f);
private bool takeScreenshot; private bool takeScreenshot;
private bool screenshotInProgress;
private bool swapchainCopied; // don't want to take screenshot if the swapchain was invalid private bool swapchainCopied; // don't want to take screenshot if the swapchain was invalid
struct DepthUniforms struct DepthUniforms
@ -86,7 +88,7 @@ namespace MoonWorks.Test
cubemapUploader.Dispose(); cubemapUploader.Dispose();
} }
public CubeGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public CubeGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
ShaderModule cubeVertShaderModule = new ShaderModule( ShaderModule cubeVertShaderModule = new ShaderModule(
GraphicsDevice, GraphicsDevice,
@ -360,7 +362,7 @@ namespace MoonWorks.Test
Logger.LogInfo("Depth-Only Mode enabled: " + depthOnlyEnabled); Logger.LogInfo("Depth-Only Mode enabled: " + depthOnlyEnabled);
} }
if (TestUtils.CheckButtonPressed(Inputs, TestUtils.ButtonType.Right)) if (!screenshotInProgress && TestUtils.CheckButtonPressed(Inputs, TestUtils.ButtonType.Right))
{ {
takeScreenshot = true; takeScreenshot = true;
} }
@ -461,32 +463,31 @@ namespace MoonWorks.Test
} }
} }
GraphicsDevice.Submit(cmdbuf);
if (takeScreenshot && swapchainCopied) if (takeScreenshot && swapchainCopied)
{ {
screenshotFence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf);
Task.Run(TakeScreenshot); Task.Run(TakeScreenshot);
takeScreenshot = false; takeScreenshot = false;
swapchainCopied = false; swapchainCopied = false;
} }
else
{
GraphicsDevice.Submit(cmdbuf);
}
} }
private unsafe void TakeScreenshot() private unsafe void TakeScreenshot()
{ {
var commandBuffer = GraphicsDevice.AcquireCommandBuffer(); screenshotInProgress = true;
commandBuffer.BeginCopyPass(); GraphicsDevice.WaitForFences(screenshotFence);
commandBuffer.DownloadFromTexture(
GraphicsDevice.DownloadFromTexture(
screenshotTexture, screenshotTexture,
screenshotTransferBuffer, screenshotTransferBuffer,
TransferOptions.Overwrite TransferOptions.Overwrite
); );
commandBuffer.EndCopyPass();
var fence = GraphicsDevice.SubmitAndAcquireFence(commandBuffer);
GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence);
ImageUtils.SavePNG( ImageUtils.SavePNG(
Path.Combine(System.AppContext.BaseDirectory, "screenshot.png"), Path.Combine(System.AppContext.BaseDirectory, "screenshot.png"),
@ -496,6 +497,11 @@ namespace MoonWorks.Test
(int) screenshotTexture.Height, (int) screenshotTexture.Height,
screenshotTexture.Format == TextureFormat.B8G8R8A8 screenshotTexture.Format == TextureFormat.B8G8R8A8
); );
GraphicsDevice.ReleaseFence(screenshotFence);
screenshotFence = null;
screenshotInProgress = false;
} }
public static void Main(string[] args) public static void Main(string[] args)

2
CullFace/CullFaceGame.cs
View File

@ -17,7 +17,7 @@ namespace MoonWorks.Test
private bool useClockwiseWinding; private bool useClockwiseWinding;
public CullFaceGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public CullFaceGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
Logger.LogInfo("Press Down to toggle the winding order of the triangles (default is counter-clockwise)"); Logger.LogInfo("Press Down to toggle the winding order of the triangles (default is counter-clockwise)");

2
DepthMSAA/DepthMSAAGame.cs
View File

@ -21,7 +21,7 @@ namespace MoonWorks.Test
private SampleCount currentSampleCount = SampleCount.Four; private SampleCount currentSampleCount = SampleCount.Four;
public DepthMSAAGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public DepthMSAAGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
Logger.LogInfo("Press Left and Right to cycle between sample counts"); Logger.LogInfo("Press Left and Right to cycle between sample counts");
Logger.LogInfo("Setting sample count to: " + currentSampleCount); Logger.LogInfo("Setting sample count to: " + currentSampleCount);

2
DrawIndirect/DrawIndirectGame.cs
View File

@ -10,7 +10,7 @@ namespace MoonWorks.Test
private GpuBuffer vertexBuffer; private GpuBuffer vertexBuffer;
private GpuBuffer drawBuffer; private GpuBuffer drawBuffer;
public DrawIndirectGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public DrawIndirectGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
// Load the shaders // Load the shaders
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert")); ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("PositionColor.vert"));

52
GetBufferData/GetBufferDataGame.cs
View File

@ -6,7 +6,7 @@ namespace MoonWorks.Test
{ {
class GetBufferDataGame : Game class GetBufferDataGame : Game
{ {
public GetBufferDataGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public GetBufferDataGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
var vertices = new System.Span<PositionVertex>( var vertices = new System.Span<PositionVertex>(
[ [
@ -33,24 +33,19 @@ namespace MoonWorks.Test
var vertexBuffer = resourceUploader.CreateBuffer(vertices, BufferUsageFlags.Vertex); var vertexBuffer = resourceUploader.CreateBuffer(vertices, BufferUsageFlags.Vertex);
resourceUploader.Upload(); // Wait for the vertices to finish copying...
resourceUploader.UploadAndWait();
resourceUploader.Dispose(); resourceUploader.Dispose();
var transferBuffer = new TransferBuffer(GraphicsDevice, vertexBuffer.Size); var transferBuffer = new TransferBuffer(GraphicsDevice, vertexBuffer.Size);
CommandBuffer cmdbuf = GraphicsDevice.AcquireCommandBuffer();
cmdbuf.BeginCopyPass();
cmdbuf.DownloadFromBuffer(vertexBuffer, transferBuffer, TransferOptions.Overwrite);
cmdbuf.EndCopyPass();
var fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf);
// Wait for the vertices to finish copying...
GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence);
// Read back and print out the vertex values // Read back and print out the vertex values
GraphicsDevice.DownloadFromBuffer(
vertexBuffer,
transferBuffer,
TransferOptions.Overwrite
);
PositionVertex[] readbackVertices = new PositionVertex[vertices.Length]; PositionVertex[] readbackVertices = new PositionVertex[vertices.Length];
transferBuffer.GetData<PositionVertex>(readbackVertices); transferBuffer.GetData<PositionVertex>(readbackVertices);
for (int i = 0; i < readbackVertices.Length; i += 1) for (int i = 0; i < readbackVertices.Length; i += 1)
@ -59,23 +54,22 @@ namespace MoonWorks.Test
} }
// Change the first three vertices and upload // Change the first three vertices and upload
cmdbuf = GraphicsDevice.AcquireCommandBuffer();
transferBuffer.SetData(otherVerts, TransferOptions.Overwrite); transferBuffer.SetData(otherVerts, TransferOptions.Overwrite);
var cmdbuf = GraphicsDevice.AcquireCommandBuffer();
cmdbuf.BeginCopyPass(); cmdbuf.BeginCopyPass();
cmdbuf.UploadToBuffer(transferBuffer, vertexBuffer, WriteOptions.SafeOverwrite); cmdbuf.UploadToBuffer(transferBuffer, vertexBuffer, WriteOptions.SafeOverwrite);
cmdbuf.EndCopyPass(); cmdbuf.EndCopyPass();
fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf); var fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf);
GraphicsDevice.WaitForFences(fence); GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence); GraphicsDevice.ReleaseFence(fence);
// Download the data // Download the data
cmdbuf = GraphicsDevice.AcquireCommandBuffer(); GraphicsDevice.DownloadFromBuffer(
cmdbuf.BeginCopyPass(); vertexBuffer,
cmdbuf.DownloadFromBuffer(vertexBuffer, transferBuffer, TransferOptions.Overwrite); transferBuffer,
cmdbuf.EndCopyPass(); TransferOptions.Overwrite
fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf); );
GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence);
// Read the updated buffer // Read the updated buffer
transferBuffer.GetData<PositionVertex>(readbackVertices); transferBuffer.GetData<PositionVertex>(readbackVertices);
@ -103,13 +97,11 @@ namespace MoonWorks.Test
GraphicsDevice.WaitForFences(fence); GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence); GraphicsDevice.ReleaseFence(fence);
cmdbuf = GraphicsDevice.AcquireCommandBuffer(); GraphicsDevice.DownloadFromBuffer(
cmdbuf.BeginCopyPass(); vertexBuffer,
cmdbuf.DownloadFromBuffer(vertexBuffer, transferBuffer, TransferOptions.Overwrite); transferBuffer,
cmdbuf.EndCopyPass(); TransferOptions.Overwrite
fence = GraphicsDevice.SubmitAndAcquireFence(cmdbuf); );
GraphicsDevice.WaitForFences(fence);
GraphicsDevice.ReleaseFence(fence);
// Read the updated buffer // Read the updated buffer
transferBuffer.GetData<PositionVertex>(readbackVertices); transferBuffer.GetData<PositionVertex>(readbackVertices);

2
InstancingAndOffsets/InstancingAndOffsetsGame.cs
View File

@ -13,7 +13,7 @@ namespace MoonWorks.Test
private bool useVertexOffset; private bool useVertexOffset;
private bool useIndexOffset; private bool useIndexOffset;
public InstancingAndOffsetsGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public InstancingAndOffsetsGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
Logger.LogInfo("Press Left to toggle vertex offset\nPress Right to toggle index offset"); Logger.LogInfo("Press Left to toggle vertex offset\nPress Right to toggle index offset");

2
MSAA/MSAAGame.cs
View File

@ -16,7 +16,7 @@ namespace MoonWorks.Test
private SampleCount currentSampleCount = SampleCount.Four; private SampleCount currentSampleCount = SampleCount.Four;
public MSAAGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public MSAAGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
Logger.LogInfo("Press Left and Right to cycle between sample counts"); Logger.LogInfo("Press Left and Right to cycle between sample counts");
Logger.LogInfo("Setting sample count to: " + currentSampleCount); Logger.LogInfo("Setting sample count to: " + currentSampleCount);

2
MSAACube/MSAACubeGame.cs
View File

@ -20,7 +20,7 @@ namespace MoonWorks.Test
private SampleCount currentSampleCount = SampleCount.Four; private SampleCount currentSampleCount = SampleCount.Four;
public MSAACubeGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public MSAACubeGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
Logger.LogInfo("Press Down to view the other side of the cubemap"); Logger.LogInfo("Press Down to view the other side of the cubemap");
Logger.LogInfo("Press Left and Right to cycle between sample counts"); Logger.LogInfo("Press Left and Right to cycle between sample counts");

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/CalculateSquares.comp.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/FillTexture.comp.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/GradientTexture.comp.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColor.vert.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorInstanced.vert.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/PositionColorWithMatrix.vert.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/PositionSampler.vert.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/RawTriangle.vert.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/Skybox.frag.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/Skybox.vert.refresh
View File

Binary file not shown.

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

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedDepthQuad.frag.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad.frag.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad.vert.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad2DArray.frag.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuad3D.frag.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadWithMatrix.vert.refresh
View File

Binary file not shown.

BIN
MoonWorks.Test.Common/Content/Shaders/Compiled/TexturedQuadWithMultiplyColor.frag.refresh
View File

Binary file not shown.

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

@ -8,43 +8,43 @@
<ItemGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))"> <ItemGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))">
<Content Include="..\..\moonlibs\x64\FAudio.dll"> <Content Include="..\..\moonlibs\x64\FAudio.dll">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\..\moonlibs\x64\Refresh.dll"> <Content Include="..\..\moonlibs\x64\Refresh.dll">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\..\moonlibs\x64\SDL2.dll"> <Content Include="..\..\moonlibs\x64\SDL2.dll">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\..\moonlibs\x64\dav1dfile.dll"> <Content Include="..\..\moonlibs\x64\dav1dfile.dll">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))"> <ItemGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))">
<Content Include="..\..\moonlibs\lib64\libFAudio.*"> <Content Include="..\..\moonlibs\lib64\libFAudio.*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\..\moonlibs\lib64\libRefresh.*"> <Content Include="..\..\moonlibs\lib64\libRefresh.*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\..\moonlibs\lib64\libSDL2-2.0.*"> <Content Include="..\..\moonlibs\lib64\libSDL2-2.0.*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\..\moonlibs\windows\libdav1dfile.*"> <Content Include="..\..\moonlibs\windows\libdav1dfile.*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))"> <ItemGroup Condition="$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))">
<Content Include="..\..\moonlibs\osx\**\*.*" > <Content Include="..\..\moonlibs\osx\**\*.*" >
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>

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

@ -4,6 +4,8 @@ namespace MoonWorks.Test
{ {
public static class TestUtils public static class TestUtils
{ {
public static Backend DefaultBackend = Backend.D3D11; // change this to test different backends
public static WindowCreateInfo GetStandardWindowCreateInfo() public static WindowCreateInfo GetStandardWindowCreateInfo()
{ {
return new WindowCreateInfo( return new WindowCreateInfo(

2
RenderTexture2D/RenderTexture2DGame.cs
View File

@ -12,7 +12,7 @@ namespace MoonWorks.Test
private Texture[] textures = new Texture[4]; private Texture[] textures = new Texture[4];
private Sampler sampler; private Sampler sampler;
public RenderTexture2DGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public RenderTexture2DGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
// Load the shaders // Load the shaders
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert")); ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("TexturedQuad.vert"));

2
WindowResizing/WindowResizingGame.cs
View File

@ -20,7 +20,7 @@ namespace MoonWorks.Test
new Res(3840, 2160), new Res(3840, 2160),
}; };
public WindowResizingGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), 60, true) public WindowResizingGame() : base(TestUtils.GetStandardWindowCreateInfo(), TestUtils.GetStandardFrameLimiterSettings(), TestUtils.DefaultBackend, 60, true)
{ {
ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangle.vert")); ShaderModule vertShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("RawTriangle.vert"));
ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag")); ShaderModule fragShaderModule = new ShaderModule(GraphicsDevice, TestUtils.GetShaderPath("SolidColor.frag"));