|
|
@@ -48,7 +48,7 @@ struct CD3DX12_RECT : public D3D12_RECT
|
|
|
bottom = Bottom;
|
|
|
}
|
|
|
~CD3DX12_RECT() {}
|
|
|
- operator const D3D12_RECT&() const { return *this; }
|
|
|
+// operator const D3D12_RECT&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -99,7 +99,7 @@ struct CD3DX12_BOX : public D3D12_BOX
|
|
|
back = Back;
|
|
|
}
|
|
|
~CD3DX12_BOX() {}
|
|
|
- operator const D3D12_BOX&() const { return *this; }
|
|
|
+// operator const D3D12_BOX&() const { return *this; }
|
|
|
};
|
|
|
inline bool operator==( const D3D12_BOX& l, const D3D12_BOX& r )
|
|
|
{
|
|
|
@@ -162,7 +162,7 @@ struct CD3DX12_DEPTH_STENCIL_DESC : public D3D12_DEPTH_STENCIL_DESC
|
|
|
BackFace.StencilFunc = backStencilFunc;
|
|
|
}
|
|
|
~CD3DX12_DEPTH_STENCIL_DESC() {}
|
|
|
- operator const D3D12_DEPTH_STENCIL_DESC&() const { return *this; }
|
|
|
+// operator const D3D12_DEPTH_STENCIL_DESC&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -189,7 +189,7 @@ struct CD3DX12_BLEND_DESC : public D3D12_BLEND_DESC
|
|
|
RenderTarget[ i ] = defaultRenderTargetBlendDesc;
|
|
|
}
|
|
|
~CD3DX12_BLEND_DESC() {}
|
|
|
- operator const D3D12_BLEND_DESC&() const { return *this; }
|
|
|
+// operator const D3D12_BLEND_DESC&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -240,7 +240,7 @@ struct CD3DX12_RASTERIZER_DESC : public D3D12_RASTERIZER_DESC
|
|
|
ConservativeRaster = conservativeRaster;
|
|
|
}
|
|
|
~CD3DX12_RASTERIZER_DESC() {}
|
|
|
- operator const D3D12_RASTERIZER_DESC&() const { return *this; }
|
|
|
+// operator const D3D12_RASTERIZER_DESC&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -258,7 +258,7 @@ struct CD3DX12_RESOURCE_ALLOCATION_INFO : public D3D12_RESOURCE_ALLOCATION_INFO
|
|
|
SizeInBytes = size;
|
|
|
Alignment = alignment;
|
|
|
}
|
|
|
- operator const D3D12_RESOURCE_ALLOCATION_INFO&() const { return *this; }
|
|
|
+// operator const D3D12_RESOURCE_ALLOCATION_INFO&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -292,7 +292,7 @@ struct CD3DX12_HEAP_PROPERTIES : public D3D12_HEAP_PROPERTIES
|
|
|
CreationNodeMask = creationNodeMask;
|
|
|
VisibleNodeMask = nodeMask;
|
|
|
}
|
|
|
- operator const D3D12_HEAP_PROPERTIES&() const { return *this; }
|
|
|
+// operator const D3D12_HEAP_PROPERTIES&() const { return *this; }
|
|
|
bool IsCPUAccessible() const
|
|
|
{
|
|
|
return Type == D3D12_HEAP_TYPE_UPLOAD || Type == D3D12_HEAP_TYPE_READBACK || (Type == D3D12_HEAP_TYPE_CUSTOM &&
|
|
|
@@ -382,7 +382,7 @@ struct CD3DX12_HEAP_DESC : public D3D12_HEAP_DESC
|
|
|
Alignment = resAllocInfo.Alignment;
|
|
|
Flags = flags;
|
|
|
}
|
|
|
- operator const D3D12_HEAP_DESC&() const { return *this; }
|
|
|
+// operator const D3D12_HEAP_DESC&() const { return *this; }
|
|
|
bool IsCPUAccessible() const
|
|
|
{ return static_cast< const CD3DX12_HEAP_PROPERTIES* >( &Properties )->IsCPUAccessible(); }
|
|
|
};
|
|
|
@@ -421,7 +421,7 @@ struct CD3DX12_CLEAR_VALUE : public D3D12_CLEAR_VALUE
|
|
|
memcpy( &DepthStencil.Depth, &depth, sizeof( depth ) );
|
|
|
DepthStencil.Stencil = stencil;
|
|
|
}
|
|
|
- operator const D3D12_CLEAR_VALUE&() const { return *this; }
|
|
|
+// operator const D3D12_CLEAR_VALUE&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -439,7 +439,7 @@ struct CD3DX12_RANGE : public D3D12_RANGE
|
|
|
Begin = begin;
|
|
|
End = end;
|
|
|
}
|
|
|
- operator const D3D12_RANGE&() const { return *this; }
|
|
|
+// operator const D3D12_RANGE&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -461,7 +461,7 @@ struct CD3DX12_TILED_RESOURCE_COORDINATE : public D3D12_TILED_RESOURCE_COORDINAT
|
|
|
Z = z;
|
|
|
Subresource = subresource;
|
|
|
}
|
|
|
- operator const D3D12_TILED_RESOURCE_COORDINATE&() const { return *this; }
|
|
|
+// operator const D3D12_TILED_RESOURCE_COORDINATE&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -485,7 +485,7 @@ struct CD3DX12_TILE_REGION_SIZE : public D3D12_TILE_REGION_SIZE
|
|
|
Height = height;
|
|
|
Depth = depth;
|
|
|
}
|
|
|
- operator const D3D12_TILE_REGION_SIZE&() const { return *this; }
|
|
|
+// operator const D3D12_TILE_REGION_SIZE&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -507,7 +507,7 @@ struct CD3DX12_SUBRESOURCE_TILING : public D3D12_SUBRESOURCE_TILING
|
|
|
DepthInTiles = depthInTiles;
|
|
|
StartTileIndexInOverallResource = startTileIndexInOverallResource;
|
|
|
}
|
|
|
- operator const D3D12_SUBRESOURCE_TILING&() const { return *this; }
|
|
|
+// operator const D3D12_SUBRESOURCE_TILING&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -527,7 +527,7 @@ struct CD3DX12_TILE_SHAPE : public D3D12_TILE_SHAPE
|
|
|
HeightInTexels = heightInTexels;
|
|
|
DepthInTexels = depthInTexels;
|
|
|
}
|
|
|
- operator const D3D12_TILE_SHAPE&() const { return *this; }
|
|
|
+// operator const D3D12_TILE_SHAPE&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -578,7 +578,7 @@ struct CD3DX12_RESOURCE_BARRIER : public D3D12_RESOURCE_BARRIER
|
|
|
barrier.UAV.pResource = pResource;
|
|
|
return result;
|
|
|
}
|
|
|
- operator const D3D12_RESOURCE_BARRIER&() const { return *this; }
|
|
|
+// operator const D3D12_RESOURCE_BARRIER&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -600,7 +600,7 @@ struct CD3DX12_PACKED_MIP_INFO : public D3D12_PACKED_MIP_INFO
|
|
|
NumTilesForPackedMips = numTilesForPackedMips;
|
|
|
StartTileIndexInOverallResource = startTileIndexInOverallResource;
|
|
|
}
|
|
|
- operator const D3D12_PACKED_MIP_INFO&() const { return *this; }
|
|
|
+// operator const D3D12_PACKED_MIP_INFO&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -634,7 +634,7 @@ struct CD3DX12_SUBRESOURCE_FOOTPRINT : public D3D12_SUBRESOURCE_FOOTPRINT
|
|
|
Depth = (resDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? resDesc.DepthOrArraySize : 1);
|
|
|
RowPitch = rowPitch;
|
|
|
}
|
|
|
- operator const D3D12_SUBRESOURCE_FOOTPRINT&() const { return *this; }
|
|
|
+// operator const D3D12_SUBRESOURCE_FOOTPRINT&() const { return *this; }
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
@@ -1304,7 +1304,7 @@ struct CD3DX12_RESOURCE_DESC : public D3D12_RESOURCE_DESC
|
|
|
{ return MipLevels * ArraySize() * PlaneCount(pDevice); }
|
|
|
inline UINT CalcSubresource(UINT MipSlice, UINT ArraySlice, UINT PlaneSlice)
|
|
|
{ return D3D12CalcSubresource(MipSlice, ArraySlice, PlaneSlice, MipLevels, ArraySize()); }
|
|
|
- operator const D3D12_RESOURCE_DESC&() const { return *this; }
|
|
|
+// operator const D3D12_RESOURCE_DESC&() const { return *this; }
|
|
|
};
|
|
|
inline bool operator==( const D3D12_RESOURCE_DESC& l, const D3D12_RESOURCE_DESC& r )
|
|
|
{
|
|
|
@@ -1356,7 +1356,7 @@ inline UINT64 GetRequiredIntermediateSize(
|
|
|
UINT64 RequiredSize = 0;
|
|
|
|
|
|
ID3D12Device* pDevice;
|
|
|
- pDestinationResource->GetDevice(__uuidof(*pDevice), reinterpret_cast<void**>(&pDevice));
|
|
|
+ pDestinationResource->GetDevice(__uuidof(ID3D12Device), reinterpret_cast<void**>(&pDevice));
|
|
|
pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, 0, nullptr, nullptr, nullptr, &RequiredSize);
|
|
|
pDevice->Release();
|
|
|
|
|
|
@@ -1450,7 +1450,7 @@ inline UINT64 UpdateSubresources(
|
|
|
|
|
|
D3D12_RESOURCE_DESC Desc = pDestinationResource->GetDesc();
|
|
|
ID3D12Device* pDevice;
|
|
|
- pDestinationResource->GetDevice(__uuidof(*pDevice), reinterpret_cast<void**>(&pDevice));
|
|
|
+ pDestinationResource->GetDevice(__uuidof(ID3D12Device), reinterpret_cast<void**>(&pDevice));
|
|
|
pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);
|
|
|
pDevice->Release();
|
|
|
|