diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-04 13:18:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 13:18:48 +0100 |
| commit | 2856740e6b238576273a321a125e9d92b687fdb2 (patch) | |
| tree | e37ece76fc1cc5bc8324fdf645816b2680b0bfc1 /drivers | |
| parent | 98f88a4102980e952b30da41f4887fab44ddbdd7 (diff) | |
| parent | c933eb7accce31e74a244ea5ed0c6bd5b0aa14ca (diff) | |
Merge pull request #36385 from kuruk-mm/some_static_asserts
Change when we can ERR_FAIL_COND and ERR_FAIL_CONV_V to static_assert
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vulkan/rendering_device_vulkan.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index 2bf8a16091..8cea8ebb86 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -6862,7 +6862,7 @@ void RenderingDeviceVulkan::initialize(VulkanContext *p_context) { max_descriptors_per_pool = GLOBAL_DEF("rendering/vulkan/descriptor_pools/max_descriptors_per_pool", 64); //check to make sure DescriptorPoolKey is good - ERR_FAIL_COND(sizeof(uint64_t) * 3 < UNIFORM_TYPE_MAX * sizeof(uint16_t)); + static_assert(sizeof(uint64_t) * 3 >= UNIFORM_TYPE_MAX * sizeof(uint16_t)); draw_list = NULL; draw_list_count = 0; |