From 73b19f29e1cc2f999d094651390ddebf9a104e03 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 24 Nov 2018 15:58:50 -0800 Subject: Updated parameter order of IDeviceContext::CopyBuffer --- Graphics/GraphicsEngine/include/DeviceContextBase.h | 4 ++-- Graphics/GraphicsEngine/interface/DeviceContext.h | 4 ++-- Graphics/GraphicsEngine/interface/TextureView.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.h b/Graphics/GraphicsEngine/include/DeviceContextBase.h index fb9eef55..1345702b 100644 --- a/Graphics/GraphicsEngine/include/DeviceContextBase.h +++ b/Graphics/GraphicsEngine/include/DeviceContextBase.h @@ -113,7 +113,7 @@ public: virtual void UpdateBuffer(IBuffer *pBuffer, Uint32 Offset, Uint32 Size, const PVoid pData)override = 0; /// Base implementation of IDeviceContext::CopyBuffer(); validates input parameters. - virtual void CopyBuffer(IBuffer *pSrcBuffer, IBuffer *pDstBuffer, Uint32 SrcOffset, Uint32 DstOffset, Uint32 Size)override = 0; + virtual void CopyBuffer(IBuffer *pSrcBuffer, Uint32 SrcOffset, IBuffer *pDstBuffer, Uint32 DstOffset, Uint32 Size)override = 0; /// Base implementaiton of IDeviceContext::UpdateData(); validates input parameters virtual void UpdateTexture( ITexture* pTexture, Uint32 MipLevel, Uint32 Slice, const Box& DstBox, const TextureSubResData& SubresData )override = 0; @@ -664,7 +664,7 @@ inline void DeviceContextBase inline void DeviceContextBase :: - CopyBuffer(IBuffer *pSrcBuffer, IBuffer *pDstBuffer, Uint32 SrcOffset, Uint32 DstOffset, Uint32 Size) + CopyBuffer(IBuffer *pSrcBuffer, Uint32 SrcOffset, IBuffer *pDstBuffer, Uint32 DstOffset, Uint32 Size) { VERIFY(pSrcBuffer != nullptr, "Source buffer must not be null"); VERIFY(pDstBuffer != nullptr, "Destination buffer must not be null"); diff --git a/Graphics/GraphicsEngine/interface/DeviceContext.h b/Graphics/GraphicsEngine/interface/DeviceContext.h index fe35d44b..d1bcc4ff 100644 --- a/Graphics/GraphicsEngine/interface/DeviceContext.h +++ b/Graphics/GraphicsEngine/interface/DeviceContext.h @@ -538,12 +538,12 @@ public: /// Copies the data from one buffer to another /// \param [in] pSrcBuffer - Source buffer to copy data from. - /// \param [in] pDstBuffer - Destination buffer to copy data to. /// \param [in] SrcOffset - Offset in bytes from the beginning of the source buffer to the beginning of data to copy. + /// \param [in] pDstBuffer - Destination buffer to copy data to. /// \param [in] DstOffset - Offset in bytes from the beginning of the destination buffer to the beginning /// of the destination region. /// \param [in] Size - Size in bytes of data to copy. - virtual void CopyBuffer(IBuffer* pSrcBuffer, IBuffer* pDstBuffer, Uint32 SrcOffset, Uint32 DstOffset, Uint32 Size) = 0; + virtual void CopyBuffer(IBuffer* pSrcBuffer, Uint32 SrcOffset, IBuffer* pDstBuffer, Uint32 DstOffset, Uint32 Size) = 0; /// Updates the data in the texture diff --git a/Graphics/GraphicsEngine/interface/TextureView.h b/Graphics/GraphicsEngine/interface/TextureView.h index d85b4750..71e4da52 100644 --- a/Graphics/GraphicsEngine/interface/TextureView.h +++ b/Graphics/GraphicsEngine/interface/TextureView.h @@ -140,16 +140,16 @@ struct TextureViewDesc : DeviceObjectAttribs { // Name is primarily used for debug purposes and does not affect the view. // It is ignored in comparison operation. - return //strcmp(Name, RHS.Name) == 0 && - ViewType == RHS.ViewType && - TextureDim == RHS.TextureDim && - Format == RHS.Format && + return //strcmp(Name, RHS.Name) == 0 && + ViewType == RHS.ViewType && + TextureDim == RHS.TextureDim && + Format == RHS.Format && MostDetailedMip == RHS.MostDetailedMip && NumMipLevels == RHS.NumMipLevels && FirstArraySlice == RHS.FirstArraySlice && FirstDepthSlice == RHS.FirstDepthSlice && NumArraySlices == RHS.NumArraySlices && - NumDepthSlices == RHS.NumDepthSlices && + NumDepthSlices == RHS.NumDepthSlices && AccessFlags == RHS.AccessFlags; } }; -- cgit v1.2.3