Merge branch 'master' into docking

# Conflicts:
#	imgui_demo.cpp
This commit is contained in:
omar
2019-03-06 21:18:46 +01:00
10 changed files with 223 additions and 164 deletions

View File

@ -18,7 +18,7 @@ static ID3D11RenderTargetView* g_mainRenderTargetView = NULL;
void CreateRenderTarget()
{
ID3D11Texture2D* pBackBuffer;
g_pSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&pBackBuffer);
g_pSwapChain->GetBuffer(0, IID_PPV_ARGS(&pBackBuffer));
g_pd3dDevice->CreateRenderTargetView(pBackBuffer, NULL, &g_mainRenderTargetView);
pBackBuffer->Release();
}