From 624ab27f15c47b5a2cb06b1fc6ac5457ab3f4c5d Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 10 Dec 2015 10:26:39 +0100 Subject: [PATCH] smaller files compiling --- renderdoc/driver/vulkan/vk_manager.cpp | 78 +++++++++++++------------- renderdoc/driver/vulkan/vk_resources.h | 4 +- renderdoc/driver/vulkan/vk_state.cpp | 6 +- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp index 33230a6df..9b380a2c0 100644 --- a/renderdoc/driver/vulkan/vk_manager.cpp +++ b/renderdoc/driver/vulkan/vk_manager.cpp @@ -73,9 +73,9 @@ void VulkanResourceManager::RecordSingleBarrier(vector< pairsecond.subresourceRange.baseMipLevel == t.subresourceRange.baseMipLevel && - it->second.subresourceRange.mipLevels == nummips && + it->second.subresourceRange.levelCount == nummips && it->second.subresourceRange.baseArrayLayer == t.subresourceRange.baseArrayLayer && - it->second.subresourceRange.arraySize == numslices) + it->second.subresourceRange.layerCount == numslices) { // verify //RDCASSERT(it->second.state == t.oldLayout); @@ -100,8 +100,8 @@ void VulkanResourceManager::RecordSingleBarrier(vector< pairsecond.subresourceRange.mipLevels == 1 && - it->second.subresourceRange.arraySize == 1 && + if(it->second.subresourceRange.levelCount == 1 && + it->second.subresourceRange.layerCount == 1 && it->second.subresourceRange.baseMipLevel >= t.subresourceRange.baseMipLevel && it->second.subresourceRange.baseMipLevel < t.subresourceRange.baseMipLevel+nummips && it->second.subresourceRange.baseArrayLayer >= t.subresourceRange.baseArrayLayer && @@ -121,14 +121,14 @@ void VulkanResourceManager::RecordSingleBarrier(vector< pairsecond.subresourceRange.mipLevels > 1 || it->second.subresourceRange.arraySize > 1) + else if(it->second.subresourceRange.levelCount > 1 || it->second.subresourceRange.layerCount > 1) { pair existing = *it; // remember where we were in the array, as after this iterators will be // invalidated. size_t offs = it - dststates.begin(); - size_t count = it->second.subresourceRange.mipLevels * it->second.subresourceRange.arraySize; + size_t count = it->second.subresourceRange.levelCount * it->second.subresourceRange.layerCount; // only insert count-1 as we want count entries total - one per subresource dststates.insert(it, count-1, existing); @@ -139,12 +139,12 @@ void VulkanResourceManager::RecordSingleBarrier(vector< pairsecond.subresourceRange.mipLevels = 1; - it->second.subresourceRange.arraySize = 1; + it->second.subresourceRange.levelCount = 1; + it->second.subresourceRange.layerCount = 1; // slice-major - it->second.subresourceRange.baseArrayLayer = uint32_t(i / existing.second.subresourceRange.mipLevels); - it->second.subresourceRange.baseMipLevel = uint32_t(i % existing.second.subresourceRange.mipLevels); + it->second.subresourceRange.baseArrayLayer = uint32_t(i / existing.second.subresourceRange.levelCount); + it->second.subresourceRange.baseMipLevel = uint32_t(i % existing.second.subresourceRange.levelCount); it++; } @@ -198,10 +198,10 @@ void VulkanResourceManager::RecordBarriers(vector< pairid : GetResID(t.image); - uint32_t nummips = t.subresourceRange.mipLevels; - uint32_t numslices = t.subresourceRange.arraySize; - if(nummips == VK_REMAINING_MIP_LEVELS) nummips = layouts[id].mipLevels - t.subresourceRange.baseMipLevel; - if(numslices == VK_REMAINING_ARRAY_LAYERS) numslices = layouts[id].arraySize - t.subresourceRange.baseArrayLayer; + uint32_t nummips = t.subresourceRange.levelCount; + uint32_t numslices = t.subresourceRange.layerCount; + if(nummips == VK_REMAINING_MIP_LEVELS) nummips = layouts[id].levelCount - t.subresourceRange.baseMipLevel; + if(numslices == VK_REMAINING_ARRAY_LAYERS) numslices = layouts[id].layerCount - t.subresourceRange.baseArrayLayer; RecordSingleBarrier(states, id, t, nummips, numslices); } @@ -217,7 +217,7 @@ void VulkanResourceManager::MergeBarriers(vector< pair & VkImageMemoryBarrier t; t.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; t.pNext = NULL; - // these input masks aren't used, we need to apply a global memory barrier + // these access masks aren't used, we need to apply a global memory barrier // to memory each time we restart log replaying. These barriers are just // to get images into the right layout - t.inputMask = 0; - t.outputMask = 0; + t.srcAccessMask = 0; + t.dstAccessMask = 0; // MULTIDEVICE need to handle multiple queues t.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - t.destQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + t.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; t.image = Unwrap(GetCurrentHandle(liveid)); t.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; t.newLayout = state.newLayout; @@ -295,9 +295,9 @@ void VulkanResourceManager::MarkSparseMapReferenced(SparseMapping *sparse) } for(size_t i=0; i < sparse->opaquemappings.size(); i++) - MarkResourceFrameReferenced(GetResID(sparse->opaquemappings[i].mem), eFrameRef_Read); + MarkResourceFrameReferenced(GetResID(sparse->opaquemappings[i].memory), eFrameRef_Read); - for(int a=0; a < VK_IMAGE_ASPECT_NUM; a++) + for(int a=0; a < NUM_VK_IMAGE_ASPECTS; a++) for(VkDeviceSize i=0; sparse->pages[a] && i < sparse->imgdim.width*sparse->imgdim.height*sparse->imgdim.depth; i++) MarkResourceFrameReferenced(GetResID(sparse->pages[a][i].first), eFrameRef_Read); } @@ -321,10 +321,10 @@ void VulkanResourceManager::ApplyBarriers(vector< pair%u, %u->%u) from %s to %s", ToStr::Get(t.subresourceRange.aspect).c_str(), - t.subresourceRange.baseMipLevel, t.subresourceRange.mipLevels, - t.subresourceRange.baseArrayLayer, t.subresourceRange.arraySize, + t.subresourceRange.baseMipLevel, t.subresourceRange.levelCount, + t.subresourceRange.baseArrayLayer, t.subresourceRange.layerCount, ToStr::Get(t.oldLayout).c_str(), ToStr::Get(t.newLayout).c_str()); bool done = false; @@ -346,8 +346,8 @@ void VulkanResourceManager::ApplyBarriers(vector< pair%u, %u->%u) from %s to %s", ToStr::Get(it->subresourceRange.aspect).c_str(), - it->range.baseMipLevel, it->range.mipLevels, - it->range.baseArrayLayer, it->range.arraySize, + it->range.baseMipLevel, it->range.levelCount, + it->range.baseArrayLayer, it->range.layerCount, ToStr::Get(it->oldLayout).c_str(), ToStr::Get(it->newLayout).c_str()); // image barriers are handled by initially inserting one subresource range for each aspect, @@ -362,9 +362,9 @@ void VulkanResourceManager::ApplyBarriers(vector< pairsubresourceRange.baseMipLevel == t.subresourceRange.baseMipLevel && - it->subresourceRange.mipLevels == nummips && + it->subresourceRange.levelCount == nummips && it->subresourceRange.baseArrayLayer == t.subresourceRange.baseArrayLayer && - it->subresourceRange.arraySize == numslices) + it->subresourceRange.layerCount == numslices) { /* RDCASSERT(t.prevstate == UNKNOWN_PREV_IMG_LAYOUT || it->state == UNKNOWN_PREV_IMG_LAYOUT || // renderdoc untracked/ignored @@ -389,8 +389,8 @@ void VulkanResourceManager::ApplyBarriers(vector< pairsubresourceRange.mipLevels == 1 && - it->subresourceRange.arraySize == 1 && + if(it->subresourceRange.levelCount == 1 && + it->subresourceRange.layerCount == 1 && it->subresourceRange.baseMipLevel >= t.subresourceRange.baseMipLevel && it->subresourceRange.baseMipLevel < t.subresourceRange.baseMipLevel+nummips && it->subresourceRange.baseArrayLayer >= t.subresourceRange.baseArrayLayer && @@ -410,14 +410,14 @@ void VulkanResourceManager::ApplyBarriers(vector< pairsubresourceRange.mipLevels > 1 || it->subresourceRange.arraySize > 1) + else if(it->subresourceRange.levelCount > 1 || it->subresourceRange.layerCount > 1) { ImageRegionState existing = *it; // remember where we were in the array, as after this iterators will be // invalidated. size_t offs = it - stit->second.subresourceStates.begin(); - size_t count = it->subresourceRange.mipLevels * it->subresourceRange.arraySize; + size_t count = it->subresourceRange.levelCount * it->subresourceRange.layerCount; // only insert count-1 as we want count entries total - one per subresource stit->second.subresourceStates.insert(it, count-1, existing); @@ -428,12 +428,12 @@ void VulkanResourceManager::ApplyBarriers(vector< pairsubresourceRange.mipLevels = 1; - it->subresourceRange.arraySize = 1; + it->subresourceRange.levelCount = 1; + it->subresourceRange.layerCount = 1; // slice-major - it->subresourceRange.baseArrayLayer = uint32_t(i / existing.subresourceRange.mipLevels); - it->subresourceRange.baseMipLevel = uint32_t(i % existing.subresourceRange.mipLevels); + it->subresourceRange.baseArrayLayer = uint32_t(i / existing.subresourceRange.levelCount); + it->subresourceRange.baseMipLevel = uint32_t(i % existing.subresourceRange.levelCount); it++; } diff --git a/renderdoc/driver/vulkan/vk_resources.h b/renderdoc/driver/vulkan/vk_resources.h index af42d49dc..cc5fcf2e8 100644 --- a/renderdoc/driver/vulkan/vk_resources.h +++ b/renderdoc/driver/vulkan/vk_resources.h @@ -771,10 +771,10 @@ struct VkResourceRecord : public ResourceRecord struct ImageLayouts { - ImageLayouts() : arraySize(1), mipLevels(1) {} + ImageLayouts() : layerCount(1), levelCount(1) {} vector subresourceStates; - int arraySize, mipLevels; + int layerCount, levelCount; VkExtent3D extent; VkFormat format; }; diff --git a/renderdoc/driver/vulkan/vk_state.cpp b/renderdoc/driver/vulkan/vk_state.cpp index 88aa9faa2..816f5dab2 100644 --- a/renderdoc/driver/vulkan/vk_state.cpp +++ b/renderdoc/driver/vulkan/vk_state.cpp @@ -104,10 +104,10 @@ void VulkanRenderState::BeginRenderPassAndApplyState(VkCommandBuffer cmd) renderArea, (uint32_t)m_CreationInfo.m_RenderPass[renderPass].attachments.size(), empty, }; - ObjDisp(cmd)->CmdBeginRenderPass(Unwrap(cmd), &rpbegin, VK_RENDER_PASS_CONTENTS_INLINE); + ObjDisp(cmd)->CmdBeginRenderPass(Unwrap(cmd), &rpbegin, VK_SUBPASS_CONTENTS_INLINE); for(uint32_t i=0; i < subpass; i++) - ObjDisp(cmd)->CmdNextSubpass(Unwrap(cmd), VK_RENDER_PASS_CONTENTS_INLINE); + ObjDisp(cmd)->CmdNextSubpass(Unwrap(cmd), VK_SUBPASS_CONTENTS_INLINE); if(graphics.pipeline != ResourceId()) { @@ -120,7 +120,7 @@ void VulkanRenderState::BeginRenderPassAndApplyState(VkCommandBuffer cmd) // only set push constant ranges that the layout uses for(size_t i=0; i < pushRanges.size(); i++) - ObjDisp(cmd)->CmdPushConstants(Unwrap(cmd), Unwrap(layout), pushRanges[i].stageFlags, pushRanges[i].start, pushRanges[i].length, pushconsts+pushRanges[i].start); + ObjDisp(cmd)->CmdPushConstants(Unwrap(cmd), Unwrap(layout), pushRanges[i].stageFlags, pushRanges[i].offset, pushRanges[i].size, pushconsts+pushRanges[i].offset); const vector &descSetLayouts = m_CreationInfo.m_PipelineLayout[pipeLayoutId].descSetLayouts;