diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-03-18 16:35:22 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-03-18 16:35:22 +0000 |
| commit | 8356e8a99fbb4eda182e838e202c11530ed81403 (patch) | |
| tree | d15c365da03ab64b1776dea43d1e2b754d03365b /Graphics/GraphicsEngine | |
| parent | Merge from master (diff) | |
| download | DiligentCore-8356e8a99fbb4eda182e838e202c11530ed81403.tar.gz DiligentCore-8356e8a99fbb4eda182e838e202c11530ed81403.zip | |
Renamed USAGE_CPU_ACCESSIBLE to USAGE_STAGING
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/DeviceContextBase.h | 8 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/GraphicsTypes.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.h b/Graphics/GraphicsEngine/include/DeviceContextBase.h index 15172c4c..b7287825 100644 --- a/Graphics/GraphicsEngine/include/DeviceContextBase.h +++ b/Graphics/GraphicsEngine/include/DeviceContextBase.h @@ -764,18 +764,18 @@ inline void DeviceContextBase<BaseInterface,ImplementationTraits> :: switch( MapType ) { case MAP_READ: - DEV_CHECK_ERR( BuffDesc.Usage == USAGE_CPU_ACCESSIBLE, "Only buffers with usage USAGE_CPU_ACCESSIBLE can be read from" ); + DEV_CHECK_ERR( BuffDesc.Usage == USAGE_STAGING, "Only buffers with usage USAGE_STAGING can be read from" ); DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_READ), "Buffer being mapped for reading was not created with CPU_ACCESS_READ flag" ); DEV_CHECK_ERR( (MapFlags & MAP_FLAG_DISCARD) == 0, "MAP_FLAG_DISCARD is not valid when mapping buffer for reading" ); break; case MAP_WRITE: - DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_CPU_ACCESSIBLE, "Only buffers with usage USAGE_CPU_ACCESSIBLE or USAGE_DYNAMIC can be mapped for writing" ); + DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_STAGING, "Only buffers with usage USAGE_STAGING or USAGE_DYNAMIC can be mapped for writing" ); DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_WRITE), "Buffer being mapped for writing was not created with CPU_ACCESS_WRITE flag" ); break; case MAP_READ_WRITE: - DEV_CHECK_ERR( BuffDesc.Usage == USAGE_CPU_ACCESSIBLE, "Only buffers with usage USAGE_CPU_ACCESSIBLE can be mapped for reading and writing" ); + DEV_CHECK_ERR( BuffDesc.Usage == USAGE_STAGING, "Only buffers with usage USAGE_STAGING can be mapped for reading and writing" ); DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_WRITE), "Buffer being mapped for reading & writing was not created with CPU_ACCESS_WRITE flag" ); DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_READ), "Buffer being mapped for reading & writing was not created with CPU_ACCESS_READ flag" ); DEV_CHECK_ERR( (MapFlags & MAP_FLAG_DISCARD) == 0, "MAP_FLAG_DISCARD is not valid when mapping buffer for reading and writing" ); @@ -792,7 +792,7 @@ inline void DeviceContextBase<BaseInterface,ImplementationTraits> :: if ( (MapFlags & MAP_FLAG_DISCARD) != 0 ) { - DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_CPU_ACCESSIBLE, "Only dynamic and staging buffers can be mapped with discard flag" ); + DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_STAGING, "Only dynamic and staging buffers can be mapped with discard flag" ); DEV_CHECK_ERR( MapType == MAP_WRITE, "MAP_FLAG_DISCARD is only valid when mapping buffer for writing" ); } } diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index e4ecbc6f..746f6a67 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -106,7 +106,7 @@ namespace Diligent /// A resource that facilitates transferring data from GPU to CPU. \n /// D3D11 Counterpart: D3D11_USAGE_STAGING. OpenGL counterpart: GL_DYNAMIC_READ - USAGE_CPU_ACCESSIBLE + USAGE_STAGING }; /// Allowed CPU access mode flags when mapping a resource |