diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-03-05 07:35:34 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-03-05 07:35:34 +0000 |
| commit | 3261ad7e4e805bbe47682c51bef615b129cba95c (patch) | |
| tree | 53aad988c370d047c4f101e9e81bb80d9b992499 /Tests/TestApp/src | |
| parent | Updated projects to conform to the update engine factory API (diff) | |
| download | DiligentEngine-3261ad7e4e805bbe47682c51bef615b129cba95c.tar.gz DiligentEngine-3261ad7e4e805bbe47682c51bef615b129cba95c.zip | |
Updates to comply with addition of ShaderFlags to IPipelineState::BindStaticResources
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/TestDrawCommands.cpp | 4 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestShaderResArrays.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestShaderResourceLayout.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestTexturing.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Tests/TestApp/src/TestDrawCommands.cpp b/Tests/TestApp/src/TestDrawCommands.cpp index d64d749..b05a166 100644 --- a/Tests/TestApp/src/TestDrawCommands.cpp +++ b/Tests/TestApp/src/TestDrawCommands.cpp @@ -256,8 +256,8 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont m_pRenderDevice->CreateResourceMapping( ResMappingDesc, &m_pResMapping ); } - m_pPSO->BindStaticResources(m_pResMapping, BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED); - m_pPSOInst->BindStaticResources(m_pResMapping, BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED | BIND_SHADER_RESOURCES_UPDATE_STATIC); + m_pPSO->BindStaticResources(SHADER_TYPE_VERTEX | SHADER_TYPE_PIXEL, m_pResMapping, BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED); + m_pPSOInst->BindStaticResources(SHADER_TYPE_VERTEX | SHADER_TYPE_PIXEL, m_pResMapping, BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED | BIND_SHADER_RESOURCES_UPDATE_STATIC); m_pPSO->CreateShaderResourceBinding(&m_pSRB, true); m_pPSOInst->CreateShaderResourceBinding(&m_pSRBInst, true); } diff --git a/Tests/TestApp/src/TestShaderResArrays.cpp b/Tests/TestApp/src/TestShaderResArrays.cpp index 8153a43..33e259f 100644 --- a/Tests/TestApp/src/TestShaderResArrays.cpp +++ b/Tests/TestApp/src/TestShaderResArrays.cpp @@ -167,7 +167,7 @@ TestShaderResArrays::TestShaderResArrays(IRenderDevice *pDevice, IDeviceContext //pVS->BindResources(m_pResourceMapping, 0); IDeviceObject *ppSRVs[] = {m_pTextures[3]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE)}; - m_pPSO->BindStaticResources(pResMapping, BIND_SHADER_RESOURCES_KEEP_EXISTING); + m_pPSO->BindStaticResources(SHADER_TYPE_VERTEX | SHADER_TYPE_PIXEL, pResMapping, BIND_SHADER_RESOURCES_KEEP_EXISTING); m_pPSO->GetStaticShaderVariable(SHADER_TYPE_PIXEL, "g_tex2DTest2")->SetArray( ppSRVs, 1, 1); m_pSRB->InitializeStaticResources(); diff --git a/Tests/TestApp/src/TestShaderResourceLayout.cpp b/Tests/TestApp/src/TestShaderResourceLayout.cpp index 2578f40..b77467a 100644 --- a/Tests/TestApp/src/TestShaderResourceLayout.cpp +++ b/Tests/TestApp/src/TestShaderResourceLayout.cpp @@ -325,7 +325,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev } } - pTestPSO->BindStaticResources(pResMapping, BIND_SHADER_RESOURCES_KEEP_EXISTING | BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED | BIND_SHADER_RESOURCES_UPDATE_STATIC); + pTestPSO->BindStaticResources(SHADER_TYPE_VERTEX | SHADER_TYPE_PIXEL, pResMapping, BIND_SHADER_RESOURCES_KEEP_EXISTING | BIND_SHADER_RESOURCES_VERIFY_ALL_RESOLVED | BIND_SHADER_RESOURCES_UPDATE_STATIC); RefCntAutoPtr<IShaderResourceBinding> pSRB; pTestPSO->CreateShaderResourceBinding(&pSRB, true); diff --git a/Tests/TestApp/src/TestTexturing.cpp b/Tests/TestApp/src/TestTexturing.cpp index 3913b80..d57e540 100644 --- a/Tests/TestApp/src/TestTexturing.cpp +++ b/Tests/TestApp/src/TestTexturing.cpp @@ -273,7 +273,7 @@ void TestTexturing::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceContext pDevice->CreatePipelineState(PSODesc, &m_pPSO); - m_pPSO->BindStaticResources(m_pResourceMapping, 0); + m_pPSO->BindStaticResources(SHADER_TYPE_VERTEX | SHADER_TYPE_PIXEL, m_pResourceMapping, 0); m_pPSO->CreateShaderResourceBinding(&m_pSRB, true); |