diff options
| author | Tony Barbour <tony@LunarG.com> | 2015-07-13 15:28:47 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-17 10:05:22 -0600 |
| commit | d2d3c3f47fa795dd6d1c70cef9ccdc350c6aea0f (patch) | |
| tree | 5e426a849efe3fe37f539800ebfd71783c935f92 | |
| parent | ea092618b1b6df81c09c6d3abb30516a7daa321e (diff) | |
| download | usermoji-d2d3c3f47fa795dd6d1c70cef9ccdc350c6aea0f.tar.xz | |
Windows: more changes for windows compiler
| -rw-r--r-- | layers/draw_state.cpp | 2 | ||||
| -rw-r--r-- | layers/shader_checker.cpp | 2 | ||||
| -rwxr-xr-x | vk-layer-generate.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 49e91f4b..816cf359 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -2788,7 +2788,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRende for (uint32_t i = 0; i < localRPCI->subpassCount; i++) { VkSubpassDescription *subpass = (VkSubpassDescription *) &localRPCI->pSubpasses[i]; const uint32_t attachmentCount = subpass->inputCount + - subpass->colorCount * (1 + (bool) subpass->resolveAttachments) + + subpass->colorCount * (1 + (subpass->resolveAttachments?1:0)) + subpass->preserveCount; VkAttachmentReference *attachments = new VkAttachmentReference[attachmentCount]; diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index 2955f8d5..94b39845 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -902,7 +902,7 @@ validate_graphics_pipeline(VkDevice dev, uint32_t count, VkGraphicsPipelineCreat loader_platform_thread_lock_mutex(&globalLock); - for (auto i = 0; i < pCreateInfo->stageCount; i++) { + for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { VkPipelineShaderStageCreateInfo const *pStage = &pCreateInfo->pStages[i]; if (pStage->sType == VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO) { diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 58b48840..8e73591a 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -1596,11 +1596,11 @@ class ThreadingSubcommand(Subcommand): if proto.name in ["FlushMappedMemoryRanges","InvalidateMappedMemoryRanges"]: funcs.append('%s%s\n' '{\n' - ' for (int i=0; i<memRangeCount; i++) {\n' + ' for (uint32_t i=0; i<memRangeCount; i++) {\n' ' useObject(pMemRanges[i].mem, "VkDeviceMemory");\n' ' }\n' ' %s%s_dispatch_table(%s)->%s;\n' - ' for (int i=0; i<memRangeCount; i++) {\n' + ' for (uint32_t i=0; i<memRangeCount; i++) {\n' ' finishUsingObject(pMemRanges[i].mem);\n' ' }\n' '%s' |