diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-04-07 19:47:57 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-04-07 19:47:57 +0000 |
| commit | b1de32bc50dd491ce037030fe313fe5db29f8a21 (patch) | |
| tree | 4b85627621b727064ce1d656605dfcd98ebc978d /Tests/TestApp/src | |
| parent | Updated core (diff) | |
| download | DiligentEngine-b1de32bc50dd491ce037030fe313fe5db29f8a21.tar.gz DiligentEngine-b1de32bc50dd491ce037030fe313fe5db29f8a21.zip | |
Updated DRAW_FLAG to match API 240022
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/TestApp.cpp | 6 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestBufferAccess.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestDrawCommands.cpp | 88 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestGeometryShader.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestSeparateTextureSampler.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestShaderResArrays.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestShaderResourceLayout.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestShaderVarAccess.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestTessellation.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestTexturing.cpp | 2 |
10 files changed, 55 insertions, 55 deletions
diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp index 9be7bc4..a252e8d 100644 --- a/Tests/TestApp/src/TestApp.cpp +++ b/Tests/TestApp/src/TestApp.cpp @@ -552,7 +552,7 @@ void TestApp::InitializeRenderers() m_pImmediateContext->ClearRenderTarget(nullptr, ClearColor, RESOURCE_STATE_TRANSITION_MODE_VERIFY); DrawAttribs DrawAttrs; DrawAttrs.NumVertices = 3; - DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES; + DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL; m_pRenderScript->Run(m_pImmediateContext, "DrawTris", DrawAttrs); // This adds transition barrier for pTex1 @@ -688,14 +688,14 @@ void TestApp::Render() DrawAttribs DrawAttrs; DrawAttrs.NumVertices = 3; - DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES; + DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL; m_pRenderScript->Run(m_pImmediateContext, "DrawTris", DrawAttrs); DrawAttrs.IsIndexed = true; DrawAttrs.NumIndices = 3; DrawAttrs.IndexType = VT_UINT32; DrawAttrs.NumInstances = 3; - DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES; + DrawAttrs.Flags = DRAW_FLAG_VERIFY_ALL; m_pRenderScript->Run(m_pImmediateContext, "DrawTris", DrawAttrs); m_pTestDrawCommands->Draw(); m_pTestBufferAccess->Draw((float)dCurrTime); diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp index 6c31c2f..9219472 100644 --- a/Tests/TestApp/src/TestBufferAccess.cpp +++ b/Tests/TestApp/src/TestBufferAccess.cpp @@ -168,7 +168,7 @@ void TestBufferAccess::Draw(float fTime) Uint32 Offsets[_countof( pBuffs )] = {0, 0, 0, 0, 0}; m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, SET_VERTEX_BUFFERS_FLAG_RESET ); - DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_STATES); + DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_ALL); DrawAttrs.NumVertices = 3; DrawAttrs.NumInstances = NumInstances; m_pDeviceContext->Draw(DrawAttrs); 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) { diff --git a/Tests/TestApp/src/TestGeometryShader.cpp b/Tests/TestApp/src/TestGeometryShader.cpp index 7977838..ec838f7 100644 --- a/Tests/TestApp/src/TestGeometryShader.cpp +++ b/Tests/TestApp/src/TestGeometryShader.cpp @@ -91,7 +91,7 @@ void TestGeometryShader::Draw() m_pDeviceContext->CommitShaderResources(nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION); // Draw 2 triangles - Diligent::DrawAttribs DrawAttrs(2, DRAW_FLAG_VERIFY_STATES); + Diligent::DrawAttribs DrawAttrs(2, DRAW_FLAG_VERIFY_ALL); m_pDeviceContext->Draw(DrawAttrs); SetStatus(TestResult::Succeeded); diff --git a/Tests/TestApp/src/TestSeparateTextureSampler.cpp b/Tests/TestApp/src/TestSeparateTextureSampler.cpp index 46e6411..fdae3d3 100644 --- a/Tests/TestApp/src/TestSeparateTextureSampler.cpp +++ b/Tests/TestApp/src/TestSeparateTextureSampler.cpp @@ -162,7 +162,7 @@ TestSeparateTextureSampler::TestSeparateTextureSampler(IRenderDevice *pDevice, I pContext->ClearRenderTarget(pRTV[0], Zero, RESOURCE_STATE_TRANSITION_MODE_VERIFY); pContext->SetPipelineState(pPSO); pContext->CommitShaderResources(pSRB, RESOURCE_STATE_TRANSITION_MODE_TRANSITION); - DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_STATES); + DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_ALL); pContext->Draw(DrawAttrs); pContext->SetRenderTargets(0, nullptr, nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION); diff --git a/Tests/TestApp/src/TestShaderResArrays.cpp b/Tests/TestApp/src/TestShaderResArrays.cpp index 21ff0ac..1ed34b7 100644 --- a/Tests/TestApp/src/TestShaderResArrays.cpp +++ b/Tests/TestApp/src/TestShaderResArrays.cpp @@ -189,7 +189,7 @@ void TestShaderResArrays::Draw() m_pDeviceContext->SetVertexBuffers( 0, 1, pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, SET_VERTEX_BUFFERS_FLAG_RESET ); // Draw a quad - Diligent::DrawAttribs DrawAttrs(4, DRAW_FLAG_VERIFY_STATES); + Diligent::DrawAttribs DrawAttrs(4, DRAW_FLAG_VERIFY_ALL); m_pDeviceContext->Draw( DrawAttrs ); SetStatus(TestResult::Succeeded); diff --git a/Tests/TestApp/src/TestShaderResourceLayout.cpp b/Tests/TestApp/src/TestShaderResourceLayout.cpp index 3d2cd94..56166b6 100644 --- a/Tests/TestApp/src/TestShaderResourceLayout.cpp +++ b/Tests/TestApp/src/TestShaderResourceLayout.cpp @@ -403,7 +403,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev pContext->SetPipelineState(pTestPSO); pContext->CommitShaderResources(pSRB, RESOURCE_STATE_TRANSITION_MODE_TRANSITION); - DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_STATES); + DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_ALL); pContext->Draw(DrawAttrs); pSRB->GetVariableByName(SHADER_TYPE_PIXEL, "storageBuff_Dyn")->Set(pSBUAVs[1]); diff --git a/Tests/TestApp/src/TestShaderVarAccess.cpp b/Tests/TestApp/src/TestShaderVarAccess.cpp index 98714da..513bb69 100644 --- a/Tests/TestApp/src/TestShaderVarAccess.cpp +++ b/Tests/TestApp/src/TestShaderVarAccess.cpp @@ -611,7 +611,7 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext pContext->SetPipelineState(pTestPSO); pContext->CommitShaderResources(pSRB, RESOURCE_STATE_TRANSITION_MODE_TRANSITION); - DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_STATES); + DrawAttribs DrawAttrs(3, DRAW_FLAG_VERIFY_ALL); pContext->Draw(DrawAttrs); pSRB->GetVariableByName(SHADER_TYPE_PIXEL, "g_rwtex2D_Dyn")->Set(pTexUAVs[7]); diff --git a/Tests/TestApp/src/TestTessellation.cpp b/Tests/TestApp/src/TestTessellation.cpp index 388f837..390a4be 100644 --- a/Tests/TestApp/src/TestTessellation.cpp +++ b/Tests/TestApp/src/TestTessellation.cpp @@ -135,7 +135,7 @@ void TestTessellation::Draw() m_pDeviceContext->CommitShaderResources(nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION); // Draw 2 quad patches - Diligent::DrawAttribs DrawAttrs(2, DRAW_FLAG_VERIFY_STATES); + Diligent::DrawAttribs DrawAttrs(2, DRAW_FLAG_VERIFY_ALL); m_pDeviceContext->Draw(DrawAttrs); m_pDeviceContext->SetPipelineState(m_pTriPSO); diff --git a/Tests/TestApp/src/TestTexturing.cpp b/Tests/TestApp/src/TestTexturing.cpp index fa2a589..83c1f16 100644 --- a/Tests/TestApp/src/TestTexturing.cpp +++ b/Tests/TestApp/src/TestTexturing.cpp @@ -313,7 +313,7 @@ void TestTexturing::Draw() m_pDeviceContext->SetVertexBuffers( 0, 1, pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, SET_VERTEX_BUFFERS_FLAG_RESET ); // Draw quad - Diligent::DrawAttribs DrawAttrs(4, DRAW_FLAG_VERIFY_STATES); + Diligent::DrawAttribs DrawAttrs(4, DRAW_FLAG_VERIFY_ALL); m_pDeviceContext->Draw( DrawAttrs ); SetStatus(TestResult::Succeeded); |
