|
@@ -278,7 +278,7 @@ void Framework::DirectX12::renderKamera(
|
|
|
desc.Height = zTarget->zImage()->getHeight();
|
|
desc.Height = zTarget->zImage()->getHeight();
|
|
|
desc.Depth = 1;
|
|
desc.Depth = 1;
|
|
|
// order of definition in DX12DescriptorHeapType must be matched
|
|
// order of definition in DX12DescriptorHeapType must be matched
|
|
|
- fillGlobalShaderParams(0);
|
|
|
|
|
|
|
+ fillGlobalShaderParams(zKamera);
|
|
|
directCommandQueue->zCommandList()->SetPipelineState1(
|
|
directCommandQueue->zCommandList()->SetPipelineState1(
|
|
|
pipeline->zPipelineState());
|
|
pipeline->zPipelineState());
|
|
|
directCommandQueue->zCommandList()->DispatchRays(&desc);
|
|
directCommandQueue->zCommandList()->DispatchRays(&desc);
|
|
@@ -525,7 +525,7 @@ void Framework::DirectX12::fillShaderBindingTable(
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-int Framework::DirectX12::fillGlobalShaderParams(int startIndex)
|
|
|
|
|
|
|
+int Framework::DirectX12::fillGlobalShaderParams(Cam3D* zKam, int startIndex)
|
|
|
{
|
|
{
|
|
|
ID3D12DescriptorHeap* heaps[]
|
|
ID3D12DescriptorHeap* heaps[]
|
|
|
= {pipeline->zGlobalSignature()->doesUseTextureDescriptorHeap()
|
|
= {pipeline->zGlobalSignature()->doesUseTextureDescriptorHeap()
|