diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-23 18:44:13 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-23 18:44:13 +0000 |
| commit | 9393ce98a7c6f0a969510503f3b2cf64198273ba (patch) | |
| tree | 97ae6d4fd88d317af36f34f9ae31fd9ffaceaa1e /Graphics/GraphicsEngine | |
| parent | Fixed formatting (diff) | |
| download | DiligentCore-9393ce98a7c6f0a969510503f3b2cf64198273ba.tar.gz DiligentCore-9393ce98a7c6f0a969510503f3b2cf64198273ba.zip | |
Renamed MAP_FLAG_DO_NOT_SYNCHRONIZE flag to MAP_FLAG_NO_OVERWRITE (API version )
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/DeviceContextBase.h | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/APIInfo.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/GraphicsTypes.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.h b/Graphics/GraphicsEngine/include/DeviceContextBase.h index d357c4f6..d7eddecc 100644 --- a/Graphics/GraphicsEngine/include/DeviceContextBase.h +++ b/Graphics/GraphicsEngine/include/DeviceContextBase.h @@ -890,8 +890,8 @@ inline void DeviceContextBase<BaseInterface, ImplementationTraits>:: if (BuffDesc.Usage == USAGE_DYNAMIC) { - DEV_CHECK_ERR((MapFlags & (MAP_FLAG_DISCARD | MAP_FLAG_DO_NOT_SYNCHRONIZE)) != 0 && MapType == MAP_WRITE, "Dynamic buffers can only be mapped for writing with MAP_FLAG_DISCARD or MAP_FLAG_DO_NOT_SYNCHRONIZE flag"); - DEV_CHECK_ERR((MapFlags & (MAP_FLAG_DISCARD | MAP_FLAG_DO_NOT_SYNCHRONIZE)) != (MAP_FLAG_DISCARD | MAP_FLAG_DO_NOT_SYNCHRONIZE), "When mapping dynamic buffer, only one of MAP_FLAG_DISCARD or MAP_FLAG_DO_NOT_SYNCHRONIZE flags must be specified"); + DEV_CHECK_ERR((MapFlags & (MAP_FLAG_DISCARD | MAP_FLAG_NO_OVERWRITE)) != 0 && MapType == MAP_WRITE, "Dynamic buffers can only be mapped for writing with MAP_FLAG_DISCARD or MAP_FLAG_NO_OVERWRITE flag"); + DEV_CHECK_ERR((MapFlags & (MAP_FLAG_DISCARD | MAP_FLAG_NO_OVERWRITE)) != (MAP_FLAG_DISCARD | MAP_FLAG_NO_OVERWRITE), "When mapping dynamic buffer, only one of MAP_FLAG_DISCARD or MAP_FLAG_NO_OVERWRITE flags must be specified"); } if ((MapFlags & MAP_FLAG_DISCARD) != 0) diff --git a/Graphics/GraphicsEngine/interface/APIInfo.h b/Graphics/GraphicsEngine/interface/APIInfo.h index 2731dac3..4f75eaaa 100644 --- a/Graphics/GraphicsEngine/interface/APIInfo.h +++ b/Graphics/GraphicsEngine/interface/APIInfo.h @@ -26,7 +26,7 @@ /// \file /// Diligent API information -#define DILIGENT_API_VERSION 240044 +#define DILIGENT_API_VERSION 240045 #include "../../../Primitives/interface/BasicTypes.h" diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index 859eaf2f..6bff6a93 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -156,25 +156,25 @@ namespace Diligent /// - ITexture::Map to describe texture mapping flags enum MAP_FLAGS : Uint8 { - MAP_FLAG_NONE = 0x000, + MAP_FLAG_NONE = 0x000, /// Specifies that map operation should not wait until previous command that /// using the same resource completes. Map returns null pointer if the resource /// is still in use.\n /// D3D11 counterpart: D3D11_MAP_FLAG_DO_NOT_WAIT /// \note: OpenGL does not have corresponding flag, so a buffer will always be mapped - MAP_FLAG_DO_NOT_WAIT = 0x001, + MAP_FLAG_DO_NOT_WAIT = 0x001, /// Previous contents of the resource will be undefined. This flag is only compatible with MAP_WRITE\n /// D3D11 counterpart: D3D11_MAP_WRITE_DISCARD. OpenGL counterpart: GL_MAP_INVALIDATE_BUFFER_BIT /// \note OpenGL implementation may orphan a buffer instead - MAP_FLAG_DISCARD = 0x002, + MAP_FLAG_DISCARD = 0x002, /// The system will not synchronize pending operations before mapping the buffer. It is responsibility /// of the application to make sure that the buffer contents is not overwritten while it is in use by /// the GPU.\n /// D3D11 counterpart: D3D11_MAP_WRITE_NO_OVERWRITE. OpenGL counterpart: GL_MAP_UNSYNCHRONIZED_BIT - MAP_FLAG_DO_NOT_SYNCHRONIZE = 0x004 + MAP_FLAG_NO_OVERWRITE = 0x004 }; DEFINE_FLAG_ENUM_OPERATORS(MAP_FLAGS) |