summaryrefslogtreecommitdiffstats
path: root/Projects
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2019-12-25 03:23:32 +0000
committerassiduous <assiduous@diligentgraphics.com>2019-12-25 03:23:32 +0000
commit040e4cb7e454d532d249d2a5de6f2aba0c902baa (patch)
treec89a3a009e2d145c3c3cfdb053ad7392eedf6d98 /Projects
parentAdded codacy bages (diff)
downloadDiligentEngine-040e4cb7e454d532d249d2a5de6f2aba0c902baa.tar.gz
DiligentEngine-040e4cb7e454d532d249d2a5de6f2aba0c902baa.zip
Updated submodules; removed tests folder (tests are now part of every submodule)
Diffstat (limited to 'Projects')
-rw-r--r--Projects/Asteroids/src/asteroids_DE.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/Projects/Asteroids/src/asteroids_DE.cpp b/Projects/Asteroids/src/asteroids_DE.cpp
index 7f55a28..59c8b36 100644
--- a/Projects/Asteroids/src/asteroids_DE.cpp
+++ b/Projects/Asteroids/src/asteroids_DE.cpp
@@ -843,7 +843,9 @@ void Asteroids::RenderSubset(Diligent::Uint32 SubsetNum,
Uint32 startIdx,
Uint32 numAsteroids)
{
- pCtx->SetRenderTargets(0, nullptr, nullptr, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
+ auto* pRTV = mSwapChain->GetCurrentBackBufferRTV();
+ auto* pDSV = mSwapChain->GetDepthBufferDSV();
+ pCtx->SetRenderTargets(1, &pRTV, pDSV, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
// Frame data
auto staticAsteroidData = mAsteroids->StaticData();
@@ -939,9 +941,11 @@ 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, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
- mDeviceCtxt->ClearRenderTarget(nullptr, clearcol, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
- mDeviceCtxt->ClearDepthStencil(nullptr, CLEAR_DEPTH_FLAG, 0.0f, 0, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
+ auto* pRTV = mSwapChain->GetCurrentBackBufferRTV();
+ auto* pDSV = mSwapChain->GetDepthBufferDSV();
+ mDeviceCtxt->SetRenderTargets(1, &pRTV, pDSV, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
+ mDeviceCtxt->ClearRenderTarget(pRTV, clearcol, RESOURCE_STATE_TRANSITION_MODE_VERIFY);
+ mDeviceCtxt->ClearDepthStencil(pDSV, CLEAR_DEPTH_FLAG, 0.0f, 0, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
LONG64 currCounter;
QueryPerformanceCounter((LARGE_INTEGER*)&currCounter);
@@ -1021,7 +1025,8 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting
QueryPerformanceCounter((LARGE_INTEGER*)&currCounter);
mRenderTicks = currCounter-mRenderTicks;
- mDeviceCtxt->SetRenderTargets(0, nullptr, nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
+ mDeviceCtxt->SetRenderTargets(1, &pRTV, pDSV, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
+
// Draw skybox
{
{