lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-24 14:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

D3D12 serialisation markup for Offset, Size type fields

Browse Source
This commit is contained in:
Jake Turner
2023-12-06 17:19:05 +00:00
parent abbba7ecd5
commit 45e32ba473
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_command_list1_wrap.cpp
+4 -4
View File
@@ -34,9 +34,9 @@ bool WrappedID3D12GraphicsCommandList::Serialise_AtomicCopyBufferUINT(
ID3D12GraphicsCommandList1 *pCommandList = this;
SERIALISE_ELEMENT(pCommandList);
SERIALISE_ELEMENT(pDstBuffer).Important();
SERIALISE_ELEMENT(DstOffset);
SERIALISE_ELEMENT(DstOffset).OffsetOrSize();
SERIALISE_ELEMENT(pSrcBuffer).Important();
SERIALISE_ELEMENT(SrcOffset);
SERIALISE_ELEMENT(SrcOffset).OffsetOrSize();
SERIALISE_ELEMENT(Dependencies);
SERIALISE_ELEMENT_ARRAY(ppDependentResources, Dependencies);
SERIALISE_ELEMENT_ARRAY(pDependentSubresourceRanges, Dependencies);
@@ -147,9 +147,9 @@ bool WrappedID3D12GraphicsCommandList::Serialise_AtomicCopyBufferUINT64(
ID3D12GraphicsCommandList1 *pCommandList = this;
SERIALISE_ELEMENT(pCommandList);
SERIALISE_ELEMENT(pDstBuffer).Important();
SERIALISE_ELEMENT(DstOffset);
SERIALISE_ELEMENT(DstOffset).OffsetOrSize();
SERIALISE_ELEMENT(pSrcBuffer).Important();
SERIALISE_ELEMENT(SrcOffset);
SERIALISE_ELEMENT(SrcOffset).OffsetOrSize();
SERIALISE_ELEMENT(Dependencies);
SERIALISE_ELEMENT_ARRAY(ppDependentResources, Dependencies);
SERIALISE_ELEMENT_ARRAY(pDependentSubresourceRanges, Dependencies);
renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+6 -6
View File
@@ -3959,9 +3959,9 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ExecuteIndirect(
SERIALISE_ELEMENT(pCommandSignature).Important();
SERIALISE_ELEMENT(MaxCommandCount).Important();
SERIALISE_ELEMENT(pArgumentBuffer).Important();
SERIALISE_ELEMENT(ArgumentBufferOffset);
SERIALISE_ELEMENT(ArgumentBufferOffset).OffsetOrSize();
SERIALISE_ELEMENT(pCountBuffer);
SERIALISE_ELEMENT(CountBufferOffset);
SERIALISE_ELEMENT(CountBufferOffset).OffsetOrSize();
SERIALISE_CHECK_READ_ERRORS();
@@ -4776,10 +4776,10 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyBufferRegion(SerialiserType
ID3D12GraphicsCommandList *pCommandList = this;
SERIALISE_ELEMENT(pCommandList);
SERIALISE_ELEMENT(pDstBuffer).Important();
SERIALISE_ELEMENT(DstOffset);
SERIALISE_ELEMENT(DstOffset).OffsetOrSize();
SERIALISE_ELEMENT(pSrcBuffer).Important();
SERIALISE_ELEMENT(SrcOffset);
SERIALISE_ELEMENT(NumBytes);
SERIALISE_ELEMENT(SrcOffset).OffsetOrSize();
SERIALISE_ELEMENT(NumBytes).OffsetOrSize();
SERIALISE_CHECK_READ_ERRORS();
@@ -5183,7 +5183,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_CopyTiles(
SERIALISE_ELEMENT_LOCAL(TileRegionStartCoordinate, *pTileRegionStartCoordinate);
SERIALISE_ELEMENT_LOCAL(TileRegionSize, *pTileRegionSize);
SERIALISE_ELEMENT(pBuffer).Important();
SERIALISE_ELEMENT(BufferStartOffsetInBytes);
SERIALISE_ELEMENT(BufferStartOffsetInBytes).OffsetOrSize();
SERIALISE_ELEMENT(Flags);
SERIALISE_CHECK_READ_ERRORS();
renderdoc/driver/d3d12/d3d12_device_rescreate_wrap.cpp
+3 -3
View File
@@ -666,7 +666,7 @@ bool WrappedID3D12Device::Serialise_CreatePlacedResource(
void **ppvResource)
{
SERIALISE_ELEMENT(pHeap).Important();
SERIALISE_ELEMENT(HeapOffset);
SERIALISE_ELEMENT(HeapOffset).OffsetOrSize();
SERIALISE_ELEMENT_LOCAL(desc, *pDesc).Named("pDesc"_lit).Important();
SERIALISE_ELEMENT(InitialState);
SERIALISE_ELEMENT_OPT(pOptimizedClearValue);
@@ -1222,7 +1222,7 @@ bool WrappedID3D12Device::Serialise_CreatePlacedResource1(
void **ppvResource)
{
SERIALISE_ELEMENT(pHeap).Important();
SERIALISE_ELEMENT(HeapOffset);
SERIALISE_ELEMENT(HeapOffset).OffsetOrSize();
SERIALISE_ELEMENT_LOCAL(desc, *pDesc).Named("pDesc"_lit).Important();
SERIALISE_ELEMENT(InitialState);
SERIALISE_ELEMENT_OPT(pOptimizedClearValue);
@@ -1318,7 +1318,7 @@ bool WrappedID3D12Device::Serialise_CreatePlacedResource2(
UINT32 NumCastableFormats, const DXGI_FORMAT *pCastableFormats, REFIID riid, void **ppvResource)
{
SERIALISE_ELEMENT(pHeap).Important();
SERIALISE_ELEMENT(HeapOffset);
SERIALISE_ELEMENT(HeapOffset).OffsetOrSize();
SERIALISE_ELEMENT_LOCAL(desc, *pDesc).Named("pDesc"_lit).Important();
SERIALISE_ELEMENT(InitialLayout);
SERIALISE_ELEMENT_OPT(pOptimizedClearValue);
renderdoc/driver/d3d12/d3d12_serialise.cpp
+12 -12
View File
@@ -339,7 +339,7 @@ void DoSerialise(SerialiserType &ser, D3D12BufferLocation &el)
buffer = rm->GetOriginalID(buffer);
ser.Serialise("Buffer"_lit, buffer).Important();
ser.Serialise("Offset"_lit, offs);
ser.Serialise("Offset"_lit, offs).OffsetOrSize();
if(ser.IsReading() && !ser.IsStructurising())
{
@@ -805,7 +805,7 @@ void DoSerialise(SerialiserType &ser, D3D12_INPUT_ELEMENT_DESC &el)
SERIALISE_MEMBER(SemanticIndex);
SERIALISE_MEMBER(Format);
SERIALISE_MEMBER(InputSlot);
SERIALISE_MEMBER(AlignedByteOffset);
SERIALISE_MEMBER(AlignedByteOffset).OffsetOrSize();
SERIALISE_MEMBER(InputSlotClass);
SERIALISE_MEMBER(InstanceDataStepRate);
}
@@ -855,7 +855,7 @@ void DoSerialise(SerialiserType &ser, D3D12_INDIRECT_ARGUMENT_DESC &el)
template <class SerialiserType>
void DoSerialise(SerialiserType &ser, D3D12_COMMAND_SIGNATURE_DESC &el)
{
SERIALISE_MEMBER(ByteStride);
SERIALISE_MEMBER(ByteStride).OffsetOrSize();
SERIALISE_MEMBER(NumArgumentDescs);
SERIALISE_MEMBER_ARRAY(pArgumentDescs, NumArgumentDescs).Important();
SERIALISE_MEMBER(NodeMask);
@@ -947,15 +947,15 @@ template <class SerialiserType>
void DoSerialise(SerialiserType &ser, D3D12_VERTEX_BUFFER_VIEW &el)
{
SERIALISE_MEMBER_TYPED(D3D12BufferLocation, BufferLocation).Important();
SERIALISE_MEMBER(SizeInBytes);
SERIALISE_MEMBER(StrideInBytes);
SERIALISE_MEMBER(SizeInBytes).OffsetOrSize();
SERIALISE_MEMBER(StrideInBytes).OffsetOrSize();
}
template <class SerialiserType>
void DoSerialise(SerialiserType &ser, D3D12_INDEX_BUFFER_VIEW &el)
{
SERIALISE_MEMBER_TYPED(D3D12BufferLocation, BufferLocation).Important();
SERIALISE_MEMBER(SizeInBytes);
SERIALISE_MEMBER(SizeInBytes).OffsetOrSize();
SERIALISE_MEMBER(Format);
}
@@ -963,7 +963,7 @@ template <class SerialiserType>
void DoSerialise(SerialiserType &ser, D3D12_STREAM_OUTPUT_BUFFER_VIEW &el)
{
SERIALISE_MEMBER_TYPED(D3D12BufferLocation, BufferLocation);
SERIALISE_MEMBER(SizeInBytes);
SERIALISE_MEMBER(SizeInBytes).OffsetOrSize();
SERIALISE_MEMBER_TYPED(D3D12BufferLocation, BufferFilledSizeLocation);
}
@@ -979,7 +979,7 @@ void DoSerialise(SerialiserType &ser, D3D12_BUFFER_SRV &el)
{
SERIALISE_MEMBER(FirstElement);
SERIALISE_MEMBER(NumElements);
SERIALISE_MEMBER(StructureByteStride);
SERIALISE_MEMBER(StructureByteStride).OffsetOrSize();
SERIALISE_MEMBER(Flags);
}
@@ -1233,8 +1233,8 @@ void DoSerialise(SerialiserType &ser, D3D12_BUFFER_UAV &el)
{
SERIALISE_MEMBER(FirstElement);
SERIALISE_MEMBER(NumElements);
SERIALISE_MEMBER(StructureByteStride);
SERIALISE_MEMBER(CounterOffsetInBytes);
SERIALISE_MEMBER(StructureByteStride).OffsetOrSize();
SERIALISE_MEMBER(CounterOffsetInBytes).OffsetOrSize();
SERIALISE_MEMBER(Flags);
}
@@ -1424,7 +1424,7 @@ void DoSerialise(SerialiserType &ser, D3D12_SUBRESOURCE_FOOTPRINT &el)
template <class SerialiserType>
void DoSerialise(SerialiserType &ser, D3D12_PLACED_SUBRESOURCE_FOOTPRINT &el)
{
SERIALISE_MEMBER(Offset);
SERIALISE_MEMBER(Offset).OffsetOrSize();
SERIALISE_MEMBER(Footprint);
}
@@ -1787,7 +1787,7 @@ void DoSerialise(SerialiserType &ser, D3D12_BUFFER_BARRIER &el)
SERIALISE_MEMBER(AccessBefore);
SERIALISE_MEMBER(AccessAfter);
SERIALISE_MEMBER(pResource).Important();
SERIALISE_MEMBER(Offset);
SERIALISE_MEMBER(Offset).OffsetOrSize();
SERIALISE_MEMBER(Size);
}