diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-23 19:08:11 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-23 19:08:11 +0000 |
| commit | 514461b57036c83fa113ad9a8636866c98f1c7d7 (patch) | |
| tree | 4d28e7a2b9fec3ad4b5952bc90fe8d3dfd8632cb /Graphics/GraphicsEngine | |
| parent | Renamed MAP_FLAG_DO_NOT_SYNCHRONIZE flag to MAP_FLAG_NO_OVERWRITE (API version ) (diff) | |
| download | DiligentCore-514461b57036c83fa113ad9a8636866c98f1c7d7.tar.gz DiligentCore-514461b57036c83fa113ad9a8636866c98f1c7d7.zip | |
Fixed issue with const PVoid not being the intended const void*
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/DeviceContextBase.h | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/DeviceContext.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.h b/Graphics/GraphicsEngine/include/DeviceContextBase.h index d7eddecc..a9bba8bd 100644 --- a/Graphics/GraphicsEngine/include/DeviceContextBase.h +++ b/Graphics/GraphicsEngine/include/DeviceContextBase.h @@ -122,7 +122,7 @@ public: inline bool SetRenderTargets(Uint32 NumRenderTargets, ITextureView* ppRenderTargets[], ITextureView* pDepthStencil); /// Base implementation of IDeviceContext::UpdateBuffer(); validates input parameters. - virtual void UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, const PVoid pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override = 0; + virtual void UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, const void* pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override = 0; /// Base implementation of IDeviceContext::CopyBuffer(); validates input parameters. virtual void CopyBuffer(IBuffer* pSrcBuffer, @@ -820,7 +820,7 @@ void DeviceContextBase<BaseInterface, ImplementationTraits>::ResetRenderTargets( template <typename BaseInterface, typename ImplementationTraits> inline void DeviceContextBase<BaseInterface, ImplementationTraits>:: - UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, const PVoid pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) + UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, const void* pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) { VERIFY(pBuffer != nullptr, "Buffer must not be null"); #ifdef DEVELOPMENT diff --git a/Graphics/GraphicsEngine/interface/DeviceContext.h b/Graphics/GraphicsEngine/interface/DeviceContext.h index 715b101d..098b7402 100644 --- a/Graphics/GraphicsEngine/interface/DeviceContext.h +++ b/Graphics/GraphicsEngine/interface/DeviceContext.h @@ -1029,7 +1029,7 @@ public: virtual void UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, - const PVoid pData, + const void* pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) = 0; |