summaryrefslogtreecommitdiffstats
path: root/Tests/TestApp/src/TestDrawCommands.cpp
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-04-07 19:47:57 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-04-07 19:47:57 +0000
commitb1de32bc50dd491ce037030fe313fe5db29f8a21 (patch)
tree4b85627621b727064ce1d656605dfcd98ebc978d /Tests/TestApp/src/TestDrawCommands.cpp
parentUpdated core (diff)
downloadDiligentEngine-b1de32bc50dd491ce037030fe313fe5db29f8a21.tar.gz
DiligentEngine-b1de32bc50dd491ce037030fe313fe5db29f8a21.zip
Updated DRAW_FLAG to match API 240022
Diffstat (limited to 'Tests/TestApp/src/TestDrawCommands.cpp')
-rw-r--r--Tests/TestApp/src/TestDrawCommands.cpp88
1 files changed, 44 insertions, 44 deletions
diff --git a/Tests/TestApp/src/TestDrawCommands.cpp b/Tests/TestApp/src/TestDrawCommands.cpp
index 809ad73..61575f1 100644
--- a/Tests/TestApp/src/TestDrawCommands.cpp
+++ b/Tests/TestApp/src/TestDrawCommands.cpp
@@ -294,14 +294,14 @@ void TestDrawCommands::Draw()
// 0,1: basic drawing
{
// Draw 2 triangles
- DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_STATES);
+ DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_ALL);
m_pDeviceContext->Draw(DrawAttrs);
}
// 2,3: test StartVertex
{
// Draw 2 triangles
- DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_STATES);
+ DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_ALL);
DrawAttrs.StartVertexLocation = 2*3;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -311,13 +311,13 @@ void TestDrawCommands::Draw()
m_pDeviceContext->SetVertexBuffers(0, 1, pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_VERIFY, SET_VERTEX_BUFFERS_FLAG_RESET);
{
// Draw 2 triangles
- DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_STATES);
+ DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_ALL);
m_pDeviceContext->Draw(DrawAttrs);
}
// 6,7: test buffer offset & StartVertex
{
- DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_STATES);
+ DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_ALL);
DrawAttrs.StartVertexLocation = 2*3;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -328,7 +328,7 @@ void TestDrawCommands::Draw()
m_pDeviceContext->CommitShaderResources(m_pSRB, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
m_pDeviceContext->SetVertexBuffers(0, 1, pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_VERIFY, SET_VERTEX_BUFFERS_FLAG_RESET);
{
- DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_STATES);// Draw 2 triangles
+ DrawAttribs DrawAttrs(2*3, DRAW_FLAG_VERIFY_ALL);// Draw 2 triangles
DrawAttrs.StartVertexLocation = 4*3/2; // Stride is 2x
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -349,7 +349,7 @@ void TestDrawCommands::Draw()
// 0,1
{
- DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_STATES);// Draw 2 triangles
+ DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_ALL);// Draw 2 triangles
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -357,7 +357,7 @@ void TestDrawCommands::Draw()
m_pDeviceContext->SetIndexBuffer( m_pIndexBuff, 2 * 3 * sizeof( Uint32 ), RESOURCE_STATE_TRANSITION_MODE_VERIFY );
{
- DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_STATES);// Draw 2 triangles
+ DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_ALL);// Draw 2 triangles
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -372,7 +372,7 @@ void TestDrawCommands::Draw()
// 0,1
{
- DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_STATES);// Draw 2 triangles
+ DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_ALL);// Draw 2 triangles
DrawAttrs.BaseVertex = 10;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -381,7 +381,7 @@ void TestDrawCommands::Draw()
m_pDeviceContext->SetIndexBuffer( m_pIndexBuff, 2 * 3 * sizeof( Uint32 ), RESOURCE_STATE_TRANSITION_MODE_VERIFY );
{
- DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_STATES);// Draw 2 triangles
+ DrawAttribs DrawAttrs(2*3, VT_UINT32, DRAW_FLAG_VERIFY_ALL);// Draw 2 triangles
DrawAttrs.BaseVertex = 10;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -408,7 +408,7 @@ void TestDrawCommands::Draw()
DrawAttribs DrawAttrs;
DrawAttrs.NumVertices = 3; // Draw 1 triangle
DrawAttrs.NumInstances = 2; // Draw 2 instances
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -419,7 +419,7 @@ void TestDrawCommands::Draw()
DrawAttribs DrawAttrs;
DrawAttrs.NumVertices = 3; // Draw 1 triangle
DrawAttrs.NumInstances = 2; // Draw 2 instances
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -429,7 +429,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumVertices = 3; // Draw 1 triangle
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.StartVertexLocation = 2*3;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
NumTestTrianglesInRow[3] = 6;
@@ -448,7 +448,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumIndices = 3; // Draw 1 triangle
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.FirstInstanceLocation = 0;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -458,7 +458,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumIndices = 3; // Draw 1 triangle
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.FirstInstanceLocation = 2;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -470,7 +470,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumIndices = 3; // Draw 1 triangle
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.FirstInstanceLocation = 2;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -482,7 +482,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumIndices = 3; // Draw 1 triangle
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.FirstInstanceLocation = 2;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
NumTestTrianglesInRow[4] = 8;
@@ -502,7 +502,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -514,7 +514,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -527,7 +527,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -540,7 +540,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -552,7 +552,7 @@ void TestDrawCommands::Draw()
DrawAttrs.FirstIndexLocation = 2*3;
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
NumTestTrianglesInRow[5] = 10;
@@ -573,7 +573,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
// 2,3
@@ -584,7 +584,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.FirstInstanceLocation = 2;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -597,7 +597,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.FirstInstanceLocation = 2;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -611,7 +611,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.FirstInstanceLocation = 2;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -624,7 +624,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.FirstInstanceLocation = 2;
DrawAttrs.FirstIndexLocation = 2*3;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
NumTestTrianglesInRow[6] = 10;
@@ -644,7 +644,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -656,7 +656,7 @@ void TestDrawCommands::Draw()
DrawAttrs.BaseVertex = 2*3;
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -669,7 +669,7 @@ void TestDrawCommands::Draw()
DrawAttrs.BaseVertex = 2*3;
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -683,7 +683,7 @@ void TestDrawCommands::Draw()
DrawAttrs.BaseVertex = 2*3;
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -696,7 +696,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.FirstIndexLocation = 2*3;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
NumTestTrianglesInRow[7] = 10;
@@ -716,7 +716,7 @@ void TestDrawCommands::Draw()
DrawAttrs.NumInstances = 2; // Draw 2 instances
DrawAttrs.IsIndexed = true;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -729,7 +729,7 @@ void TestDrawCommands::Draw()
DrawAttrs.BaseVertex = 3;
DrawAttrs.FirstInstanceLocation = 1;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -743,7 +743,7 @@ void TestDrawCommands::Draw()
DrawAttrs.BaseVertex = 3;
DrawAttrs.FirstInstanceLocation = 1;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -758,7 +758,7 @@ void TestDrawCommands::Draw()
DrawAttrs.BaseVertex = 3;
DrawAttrs.FirstInstanceLocation = 1;
DrawAttrs.IndexType = VT_UINT32;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -772,7 +772,7 @@ void TestDrawCommands::Draw()
DrawAttrs.FirstInstanceLocation = 1;
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.FirstIndexLocation = 2*3;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
NumTestTrianglesInRow[8] = 10;
@@ -797,7 +797,7 @@ void TestDrawCommands::Draw()
MappedData[3] = 0; // Start instance
MappedData.Unmap();
- DrawAttribs DrawAttrs(m_pIndirectDrawArgs, DRAW_FLAG_VERIFY_STATES, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
+ DrawAttribs DrawAttrs(m_pIndirectDrawArgs, DRAW_FLAG_VERIFY_ALL, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -809,7 +809,7 @@ void TestDrawCommands::Draw()
MappedData[2] = 3*2; // Start vertex
MappedData[3] = 0; // Start instance
MappedData.Unmap();
- DrawAttribs DrawAttrs(m_pIndirectDrawArgs, DRAW_FLAG_VERIFY_STATES, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
+ DrawAttribs DrawAttrs(m_pIndirectDrawArgs, DRAW_FLAG_VERIFY_ALL, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -824,7 +824,7 @@ void TestDrawCommands::Draw()
DrawAttribs DrawAttrs;
DrawAttrs.pIndirectDrawAttribs = m_pIndirectDrawArgs;
DrawAttrs.IndirectAttribsBufferStateTransitionMode = RESOURCE_STATE_TRANSITION_MODE_VERIFY;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -850,7 +850,7 @@ void TestDrawCommands::Draw()
MappedData[4] = 0; // Start instance
MappedData.Unmap();
- DrawAttribs DrawAttrs(m_pIndexedIndirectDrawArgs, VT_UINT32, DRAW_FLAG_VERIFY_STATES, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
+ DrawAttribs DrawAttrs(m_pIndexedIndirectDrawArgs, VT_UINT32, DRAW_FLAG_VERIFY_ALL, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -869,7 +869,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.pIndirectDrawAttribs = m_pIndexedIndirectDrawArgs;
DrawAttrs.IndirectAttribsBufferStateTransitionMode = RESOURCE_STATE_TRANSITION_MODE_VERIFY;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -888,7 +888,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.pIndirectDrawAttribs = m_pIndexedIndirectDrawArgs;
DrawAttrs.IndirectAttribsBufferStateTransitionMode = RESOURCE_STATE_TRANSITION_MODE_VERIFY;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
@@ -907,7 +907,7 @@ void TestDrawCommands::Draw()
DrawAttrs.IndexType = VT_UINT32;
DrawAttrs.pIndirectDrawAttribs = m_pIndexedIndirectDrawArgs;
DrawAttrs.IndirectAttribsBufferStateTransitionMode = RESOURCE_STATE_TRANSITION_MODE_VERIFY;
- DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES;
+ DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL;
m_pDeviceContext->Draw(DrawAttrs);
}
NumTestTrianglesInRow[10] = 8;
@@ -923,7 +923,7 @@ void TestDrawCommands::Draw()
{
// Draw 1 triangle
- DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_STATES);
+ DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_ALL);
for(int iRow=0; iRow < TriGridSize; ++iRow)
{