diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-06-10 21:54:41 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-06-10 21:54:41 +0000 |
| commit | e0d30b2e8a50adefcfa299b6cce8ec44056c2638 (patch) | |
| tree | e3b0603b5311b3fd77615dec99a9fd32fcf81825 /Graphics | |
| parent | Added static tests to catch base class misalginment issues (diff) | |
| download | DiligentCore-e0d30b2e8a50adefcfa299b6cce8ec44056c2638.tar.gz DiligentCore-e0d30b2e8a50adefcfa299b6cce8ec44056c2638.zip | |
Fixed few alignment-related issues (API Version 240063)
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngine/interface/APIInfo.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/interface/GraphicsTypes.h | 3 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngine/interface/APIInfo.h b/Graphics/GraphicsEngine/interface/APIInfo.h index c86914dc..18833f81 100644 --- a/Graphics/GraphicsEngine/interface/APIInfo.h +++ b/Graphics/GraphicsEngine/interface/APIInfo.h @@ -30,7 +30,7 @@ /// \file /// Diligent API information -#define DILIGENT_API_VERSION 240062 +#define DILIGENT_API_VERSION 240063 #include "../../../Primitives/interface/BasicTypes.h" diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index ece12fea..0d0631b7 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -1866,6 +1866,9 @@ struct TextureFormatInfo DILIGENT_DERIVE(TextureFormatAttribs) /// Indicates if the format is supported by the device bool Supported DEFAULT_INITIALIZER(false); + + // Explicitly pad the structure to 8-byte boundary + bool Padding[7]; }; typedef struct TextureFormatInfo TextureFormatInfo; diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp index 74293d1b..523a5108 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp @@ -61,7 +61,7 @@ ShaderVkImpl::ShaderVkImpl(IReferenceCounters* pRefCounters, DEV_CHECK_ERR(CreationAttribs.ByteCode == nullptr, "'ByteCode' must be null when shader is created from source code or a file"); DEV_CHECK_ERR(CreationAttribs.ByteCodeSize == 0, "'ByteCodeSize' must be 0 when shader is created from source code or a file"); - static constexpr char* VulkanDefine = + static constexpr char VulkanDefine[] = "#ifndef VULKAN\n" "# define VULKAN 1\n" "#endif\n"; |