diff options
| author | Tobin Ehlis <tobine@google.com> | 2019-08-22 08:17:56 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2019-08-23 06:55:13 -0600 |
| commit | dadc5a0ce594636977b40f865cafec4b427e2c51 (patch) | |
| tree | 0749aebfb7c3f66d1b51ce77484f4c32090e47a6 | |
| parent | fd68ba1dce9413f66442baed01a4618544dbdddc (diff) | |
| download | vulkan-validation-layers-dadc5a0ce594636977b40f865cafec4b427e2c51.tar.gz | |
layers:Guard (std::min) to avoid Windows conflict
Putting parens around (std::min) avoids "error: expected unqualified-id"
build error on Windows due to its built-in "min" macro.
| -rw-r--r-- | layers/core_validation_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h index 72dbdf23d..a8ec77da1 100644 --- a/layers/core_validation_types.h +++ b/layers/core_validation_types.h @@ -814,8 +814,8 @@ class ImageSubresourceLayoutMapImpl : public ImageSubresourceLayoutMap { return subres; } - uint32_t LevelLimit(uint32_t level) const { return std::min(image_state_.full_range.levelCount, level); } - uint32_t LayerLimit(uint32_t layer) const { return std::min(image_state_.full_range.layerCount, layer); } + uint32_t LevelLimit(uint32_t level) const { return (std::min)(image_state_.full_range.levelCount, level); } + uint32_t LayerLimit(uint32_t layer) const { return (std::min)(image_state_.full_range.layerCount, layer); } bool InRange(const VkImageSubresource &subres) const { bool in_range = (subres.mipLevel < image_state_.full_range.levelCount) && |