diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-11-23 10:18:53 -0700 |
|---|---|---|
| committer | Cort <cdwfs@users.noreply.github.com> | 2017-02-14 14:22:47 -0800 |
| commit | 66f55e4cbb116c94db5b09db92c4d932d87c7275 (patch) | |
| tree | df454a2fd76380f648f58240827c0c420a87c600 /layers/core_validation.cpp | |
| parent | 21596cd8dff8766fe7827217c1f9c204bfb223d8 (diff) | |
| download | usermoji-66f55e4cbb116c94db5b09db92c4d932d87c7275.tar.xz | |
layers: Update BindImageMemory var names for style
Change-Id: I38fa79b4c696b3d986558cd885156004ad082468
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index c008d45b..74d2d68d 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -10083,22 +10083,22 @@ VKAPI_ATTR VkResult VKAPI_CALL InvalidateMappedMemoryRanges(VkDevice device, uin VKAPI_ATTR VkResult VKAPI_CALL BindImageMemory(VkDevice device, VkImage image, VkDeviceMemory mem, VkDeviceSize memoryOffset) { layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map); VkResult result = VK_ERROR_VALIDATION_FAILED_EXT; - bool skip_call = false; + bool skip = false; std::unique_lock<std::mutex> lock(global_lock); auto image_state = GetImageState(dev_data, image); if (image_state) { // Track objects tied to memory uint64_t image_handle = reinterpret_cast<uint64_t &>(image); - skip_call = SetMemBinding(dev_data, mem, image_handle, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "vkBindImageMemory"); + skip = SetMemBinding(dev_data, mem, image_handle, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "vkBindImageMemory"); if (!image_state->memory_requirements_checked) { // There's not an explicit requirement in the spec to call vkGetImageMemoryRequirements() prior to calling // BindImageMemory but it's implied in that memory being bound must conform with VkMemoryRequirements from // vkGetImageMemoryRequirements() - skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_WARNING_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, - image_handle, __LINE__, DRAWSTATE_INVALID_IMAGE, "DS", - "vkBindImageMemory(): Binding memory to image 0x%" PRIxLEAST64 - " but vkGetImageMemoryRequirements() has not been called on that image.", - image_handle); + skip |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_WARNING_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, + image_handle, __LINE__, DRAWSTATE_INVALID_IMAGE, "DS", + "vkBindImageMemory(): Binding memory to image 0x%" PRIxLEAST64 + " but vkGetImageMemoryRequirements() has not been called on that image.", + image_handle); // Make the call for them so we can verify the state lock.unlock(); dev_data->dispatch_table.GetImageMemoryRequirements(device, image, &image_state->requirements); @@ -10108,14 +10108,14 @@ VKAPI_ATTR VkResult VKAPI_CALL BindImageMemory(VkDevice device, VkImage image, V // Track and validate bound memory range information auto mem_info = GetMemObjInfo(dev_data, mem); if (mem_info) { - skip_call |= InsertImageMemoryRange(dev_data, image, mem_info, memoryOffset, image_state->requirements, - image_state->createInfo.tiling == VK_IMAGE_TILING_LINEAR); - skip_call |= ValidateMemoryTypes(dev_data, mem_info, image_state->requirements.memoryTypeBits, "vkBindImageMemory()", - VALIDATION_ERROR_00806); + skip |= InsertImageMemoryRange(dev_data, image, mem_info, memoryOffset, image_state->requirements, + image_state->createInfo.tiling == VK_IMAGE_TILING_LINEAR); + skip |= ValidateMemoryTypes(dev_data, mem_info, image_state->requirements.memoryTypeBits, "vkBindImageMemory", + VALIDATION_ERROR_00806); } lock.unlock(); - if (!skip_call) { + if (!skip) { result = dev_data->dispatch_table.BindImageMemory(device, image, mem, memoryOffset); lock.lock(); image_state->binding.mem = mem; |
