diff options
| author | dan sinclair <dj2@everburning.com> | 2019-01-21 13:50:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 13:50:12 -0500 |
| commit | 01eef922a0711110a884304703df23f762683a36 (patch) | |
| tree | bcde39b9fa7db43614723955572e327d225d3d79 | |
| parent | 01168a937639e502545450caf44ddeead7aa186f (diff) | |
| download | amber-01eef922a0711110a884304703df23f762683a36.tar.gz | |
Fixup casts for CTS. (#241)
| -rw-r--r-- | include/amber/vulkan_header.h | 9 | ||||
| -rw-r--r-- | src/vulkan/bit_copy.cc | 11 | ||||
| -rw-r--r-- | src/vulkan/push_constant.cc | 6 |
3 files changed, 18 insertions, 8 deletions
diff --git a/include/amber/vulkan_header.h b/include/amber/vulkan_header.h index 64c3194..fa3d237 100644 --- a/include/amber/vulkan_header.h +++ b/include/amber/vulkan_header.h @@ -16,12 +16,19 @@ #define AMBER_VULKAN_HEADER_H_ #if AMBER_CTS_VULKAN_HEADER + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wreserved-id-macro" #include "vkDefs.h" -#else // DAMBER_CTS_VULKAN_HEADER +#pragma clang diagnostic pop + +#else // AMBER_CTS_VULKAN_HEADER + #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" #include "vulkan/vulkan.h" #pragma clang diagnostic pop + #endif // AMBER_CTS_VULKAN_HEADER #endif // AMBER_VULKAN_HEADER_H_ diff --git a/src/vulkan/bit_copy.cc b/src/vulkan/bit_copy.cc index 9d04846..9bea526 100644 --- a/src/vulkan/bit_copy.cc +++ b/src/vulkan/bit_copy.cc @@ -31,7 +31,8 @@ void BitCopy::ShiftBufferBits(uint8_t* buffer, uint8_t carry = 0; for (uint32_t i = 0; i < length_bytes; ++i) { - uint8_t new_value = static_cast<uint8_t>(buffer[i] << shift_bits) | carry; + uint8_t new_value = static_cast<uint8_t>( + static_cast<uint8_t>(buffer[i] << shift_bits) | carry); carry = static_cast<uint8_t>(buffer[i] >> (8 - shift_bits)); buffer[i] = new_value; } @@ -150,8 +151,8 @@ uint16_t BitCopy::FloatToHexFloat11(const float value) { uint32_t hex; memcpy(&hex, &value, sizeof(float)); assert(FloatSign(hex) == 0); - return static_cast<uint16_t>(FloatExponent(hex) << 6U) | - static_cast<uint16_t>(FloatMantissa(hex) >> 4U); + return static_cast<uint16_t>(static_cast<uint16_t>(FloatExponent(hex) << 6U) | + static_cast<uint16_t>(FloatMantissa(hex) >> 4U)); } // static @@ -159,8 +160,8 @@ uint16_t BitCopy::FloatToHexFloat10(const float value) { uint32_t hex; memcpy(&hex, &value, sizeof(float)); assert(FloatSign(hex) == 0); - return static_cast<uint16_t>(FloatExponent(hex) << 5U) | - static_cast<uint16_t>(FloatMantissa(hex) >> 5U); + return static_cast<uint16_t>(static_cast<uint16_t>(FloatExponent(hex) << 5U) | + static_cast<uint16_t>(FloatMantissa(hex) >> 5U)); } } // namespace vulkan diff --git a/src/vulkan/push_constant.cc b/src/vulkan/push_constant.cc index b0389f2..1dbedaf 100644 --- a/src/vulkan/push_constant.cc +++ b/src/vulkan/push_constant.cc @@ -22,7 +22,9 @@ namespace amber { namespace vulkan { PushConstant::PushConstant(uint32_t max_push_constant_size) - : Resource(VK_NULL_HANDLE, max_push_constant_size, {}), + : Resource(VK_NULL_HANDLE, + max_push_constant_size, + VkPhysicalDeviceMemoryProperties()), max_push_constant_size_(max_push_constant_size), memory_(std::unique_ptr<uint8_t>(new uint8_t[max_push_constant_size])) { SetMemoryPtr(static_cast<void*>(memory_.get())); @@ -32,7 +34,7 @@ PushConstant::~PushConstant() = default; VkPushConstantRange PushConstant::GetPushConstantRange() { if (push_constant_data_.empty()) - return {}; + return VkPushConstantRange(); auto it = std::min_element(push_constant_data_.begin(), push_constant_data_.end(), |