Fix samplers for root sig 1.1 in EZ

1. Fix error interpretation for D3DX12SerializeVersionedRootSignature 2. Fix samplers for root signature 1.1 in EZ
StarsX · May 7, 2023 · a5c01e5 · a5c01e5
1 parent 1117675
commit a5c01e5
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git a/XUSG-EZ/XUSG-EZ_DX12.cpp b/XUSG-EZ/XUSG-EZ_DX12.cpp
@@ -764,7 +764,7 @@ bool EZ::CommandList_DX12::createGraphicsPipelineLayouts(
 
 		if (stageMaxSamplers > 0)
 		{
-			pipelineLayout->SetRange(paramIndex, DescriptorType::SAMPLER, stageMaxSamplers, 0, 0, DescriptorFlag::DATA_STATIC);
+			pipelineLayout->SetRange(paramIndex, DescriptorType::SAMPLER, stageMaxSamplers, 0);
 			pipelineLayout->SetShaderStage(paramIndex++, stage);
 		}
 	}
@@ -846,7 +846,7 @@ bool EZ::CommandList_DX12::createComputePipelineLayouts(uint32_t maxSamplers,
 	m_computeSpaceToParamIndexMap[static_cast<uint32_t>(DescriptorType::SRV)].resize(maxSrvSpaces);
 	m_computeSpaceToParamIndexMap[static_cast<uint32_t>(DescriptorType::UAV)].resize(maxUavSpaces);
 
-	pipelineLayout->SetRange(paramIndex++, DescriptorType::SAMPLER, maxSamplers, 0, 0, DescriptorFlag::DATA_STATIC);
+	pipelineLayout->SetRange(paramIndex++, DescriptorType::SAMPLER, maxSamplers, 0);
 
 	for (auto s = 0u; s < maxSpaces; ++s)
 	{

diff --git a/XUSG-EZ/XUSGUltimate-EZ_DX12.cpp b/XUSG-EZ/XUSGUltimate-EZ_DX12.cpp
@@ -225,7 +225,7 @@ bool EZ::CommandList_DX12::createMeshShaderPipelineLayouts(
 
 		if (stageMaxSamplers > 0)
 		{
-			pipelineLayout->SetRange(paramIndex, DescriptorType::SAMPLER, stageMaxSamplers, 0, 0, DescriptorFlag::DATA_STATIC);
+			pipelineLayout->SetRange(paramIndex, DescriptorType::SAMPLER, stageMaxSamplers, 0);
 			pipelineLayout->SetShaderStage(paramIndex++, stage);
 		}
 	}

diff --git a/XUSG/Core/XUSG.cpp b/XUSG/Core/XUSG.cpp
@@ -395,8 +395,3 @@ uint8_t XUSG::CalculateMipLevels(uint64_t width, uint32_t height, uint32_t depth
 {
 	return CalculateMipLevels(static_cast<uint32_t>(width), height, depth);
 }
-
-uint32_t XUSG::CalculateSubresource(uint8_t mipSlice, uint8_t numMips, uint32_t arraySlice, uint32_t arraySize, uint8_t planeSlice)
-{
-	return mipSlice + arraySlice * numMips + planeSlice * numMips * arraySize;
-}
diff --git a/XUSG/Core/XUSG.h b/XUSG/Core/XUSG.h
@@ -2317,5 +2317,4 @@ namespace XUSG
 	XUSG_INTERFACE uint8_t Log2(uint32_t value);
 	XUSG_INTERFACE uint8_t CalculateMipLevels(uint32_t width, uint32_t height, uint32_t depth = 1);
 	XUSG_INTERFACE uint8_t CalculateMipLevels(uint64_t width, uint32_t height, uint32_t depth = 1);
-	XUSG_INTERFACE uint32_t CalculateSubresource(uint8_t mipSlice, uint8_t numMips, uint32_t arraySlice, uint32_t arraySize, uint8_t planeSlice);
 }
diff --git a/XUSG/Core/XUSGPipelineLayout_DX12.cpp b/XUSG/Core/XUSGPipelineLayout_DX12.cpp
@@ -370,7 +370,7 @@ PipelineLayout PipelineLayoutLib_DX12::createPipelineLayout(const string& key, c
 
 	com_ptr<ID3DBlob> signature, error;
 	H_RETURN(D3DX12SerializeVersionedRootSignature(&rootSignatureDesc, highestVersion, signature.put(), error.put()),
-		cerr, reinterpret_cast<wchar_t*>(error->GetBufferPointer()), nullptr);
+		cerr, reinterpret_cast<char*>(error->GetBufferPointer()), nullptr);
 
 	return createRootSignature(key, signature->GetBufferPointer(), signature->GetBufferSize(), name, nodeMask);
 }

diff --git a/XUSGRayTracing-EZ/XUSGRayTracing-EZ_DX12.cpp b/XUSGRayTracing-EZ/XUSGRayTracing-EZ_DX12.cpp
@@ -372,7 +372,7 @@ bool EZ::CommandList_DXR::createComputePipelineLayouts(uint32_t maxSamplers, con
 	m_computeSpaceToParamIndexMap[static_cast<uint32_t>(DescriptorType::UAV)].resize(maxUavSpaces);
 	m_tlasBindingToParamIndexMap.resize(maxTLASSrvs);
 
-	pipelineLayout->SetRange(paramIndex++, DescriptorType::SAMPLER, maxSamplers, 0, 0, DescriptorFlag::DATA_STATIC);
+	pipelineLayout->SetRange(paramIndex++, DescriptorType::SAMPLER, maxSamplers, 0);
 
 	for (auto s = 0u; s < maxSpaces; ++s)
 	{

diff --git a/XUSGRayTracing/RayTracing/XUSGRayTracingPipelineLayout_DX12.cpp b/XUSGRayTracing/RayTracing/XUSGRayTracingPipelineLayout_DX12.cpp
@@ -79,7 +79,7 @@ XUSG::PipelineLayout RayTracing::PipelineLayout_DX12::CreatePipelineLayout(const
 	com_ptr<ID3DBlob> signature, error;
 	const auto pDxDevice = static_cast<ID3D12RaytracingFallbackDevice*>(pDevice->GetRTHandle());
 	H_RETURN(pDxDevice->D3D12SerializeVersionedRootSignature(&rootSignatureDesc, &signature, &error,
-		AccelerationStructure::GetUAVCount()), cerr, reinterpret_cast<wchar_t*>(error->GetBufferPointer()), nullptr);
+		AccelerationStructure::GetUAVCount()), cerr, reinterpret_cast<char*>(error->GetBufferPointer()), nullptr);
 
 	V_RETURN(pDxDevice->CreateRootSignature(1, signature->GetBufferPointer(), signature->GetBufferSize(),
 		IID_PPV_ARGS(&rootSignature)), cerr, nullptr);