From 82d59de0d193554e1231b06347078d41ed8ec8d3 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Fri, 30 Nov 2018 23:15:55 -0800
Subject: Improved thread safety of enum flags; added explicit state
 transitions to SetRenderTargets()

---
 Projects/Asteroids/src/asteroids_DE.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Projects')

diff --git a/Projects/Asteroids/src/asteroids_DE.cpp b/Projects/Asteroids/src/asteroids_DE.cpp
index 9f4cd69..6494e49 100644
--- a/Projects/Asteroids/src/asteroids_DE.cpp
+++ b/Projects/Asteroids/src/asteroids_DE.cpp
@@ -698,7 +698,7 @@ void Asteroids::RenderSubset(Diligent::Uint32 SubsetNum,
                              Uint32 startIdx, 
                              Uint32 numAsteroids)
 {
-    pCtx->SetRenderTargets(0, nullptr, nullptr);
+    pCtx->SetRenderTargets(0, nullptr, nullptr, SET_RENDER_TARGETS_FLAG_VERIFY_STATES);
     
     // Frame data
     auto staticAsteroidData = mAsteroids->StaticData();
@@ -709,7 +709,7 @@ void Asteroids::RenderSubset(Diligent::Uint32 SubsetNum,
     {
         IBuffer* ia_buffers[] = { mVertexBuffer };
         Uint32 ia_offsets[] = { 0 };
-        pCtx->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, 0);
+        pCtx->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, SET_VERTEX_BUFFERS_FLAG_NONE);
         pCtx->SetIndexBuffer(mIndexBuffer, 0);
     }
 
@@ -759,7 +759,7 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting
     
     // Clear the render target
     float clearcol[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    mDeviceCtxt->SetRenderTargets(0, nullptr, nullptr);
+    mDeviceCtxt->SetRenderTargets(0, nullptr, nullptr, SET_RENDER_TARGETS_FLAG_TRANSITION_ALL);
     mDeviceCtxt->ClearRenderTarget(nullptr, clearcol);
     mDeviceCtxt->ClearDepthStencil(nullptr, CLEAR_DEPTH_FLAG, 0.0f, 0);
 
@@ -828,7 +828,7 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting
     QueryPerformanceCounter((LARGE_INTEGER*)&currCounter);
     mRenderTicks = currCounter-mRenderTicks;
 
-    mDeviceCtxt->SetRenderTargets(0, nullptr, nullptr);
+    mDeviceCtxt->SetRenderTargets(0, nullptr, nullptr, SET_RENDER_TARGETS_FLAG_TRANSITION_ALL);
     // Draw skybox
     {
         {
@@ -838,7 +838,7 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting
 
         IBuffer* ia_buffers[] = { mSkyboxVertexBuffer };
         UINT ia_offsets[] = { 0 };
-        mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, 0);
+        mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, SET_VERTEX_BUFFERS_FLAG_NONE);
 
         mDeviceCtxt->SetPipelineState(mSkyboxPSO);
         mDeviceCtxt->CommitShaderResources(mSkyboxSRB, COMMIT_SHADER_RESOURCES_FLAG_TRANSITION_RESOURCES);
@@ -867,7 +867,7 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting
 
         IBuffer* ia_buffers[] = { mSpriteVertexBuffer };
         Uint32 ia_offsets[] = { 0 };
-        mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, 0);
+        mDeviceCtxt->SetVertexBuffers(0, 1, ia_buffers, ia_offsets, SET_VERTEX_BUFFERS_FLAG_NONE);
 
         // Draw
         UINT vertexStart = 0;
-- 
cgit v1.2.3