Image dirtiness
Instead of updating images every time we write to them,
this cl adds a dirtiness mechanism, which will mark an
Image object as dirty for specific unique subresource
regions and then only actually perform the required
task (cube border update, decompression, ...) once the
image memory is accessed for reading.
Bug: b/159045555
Change-Id: I791a69529e4c2e78aa6562251020aa0bf978bd01
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/45188
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Vulkan/VkDescriptorSet.cpp b/src/Vulkan/VkDescriptorSet.cpp
new file mode 100644
index 0000000..5cce513
--- /dev/null
+++ b/src/Vulkan/VkDescriptorSet.cpp
@@ -0,0 +1,89 @@
+// Copyright 2020 The SwiftShader Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "VkDescriptorSet.hpp"
+#include "VkImageView.hpp"
+#include "VkPipelineLayout.hpp"
+
+namespace vk {
+
+void DescriptorSet::ParseDescriptors(const Array &descriptorSets, const PipelineLayout *layout, NotificationType notificationType)
+{
+ if(layout)
+ {
+ uint32_t descriptorSetCount = layout->getDescriptorSetCount();
+ ASSERT(descriptorSetCount <= MAX_BOUND_DESCRIPTOR_SETS);
+
+ for(uint32_t i = 0; i < descriptorSetCount; ++i)
+ {
+ DescriptorSet *descriptorSet = descriptorSets[i];
+ if(!descriptorSet)
+ {
+ continue;
+ }
+
+ marl::lock lock(descriptorSet->header.mutex);
+ uint32_t bindingCount = layout->getBindingCount(i);
+ for(uint32_t j = 0; j < bindingCount; ++j)
+ {
+ VkDescriptorType type = layout->getDescriptorType(i, j);
+ uint32_t descriptorCount = layout->getDescriptorCount(i, j);
+ uint32_t descriptorSize = layout->getDescriptorSize(i, j);
+ uint8_t *descriptorMemory = descriptorSet->data + layout->getBindingOffset(i, j);
+
+ for(uint32_t k = 0; k < descriptorCount; k++)
+ {
+ ImageView *memoryOwner = nullptr;
+ switch(type)
+ {
+ case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
+ case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
+ memoryOwner = reinterpret_cast<SampledImageDescriptor *>(descriptorMemory)->memoryOwner;
+ break;
+ case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
+ case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
+ memoryOwner = reinterpret_cast<StorageImageDescriptor *>(descriptorMemory)->memoryOwner;
+ break;
+ default:
+ break;
+ }
+ if(memoryOwner)
+ {
+ if(notificationType == PREPARE_FOR_SAMPLING)
+ {
+ memoryOwner->prepareForSampling();
+ }
+ else if((notificationType == CONTENTS_CHANGED) && (type == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE))
+ {
+ memoryOwner->contentsChanged();
+ }
+ }
+ descriptorMemory += descriptorSize;
+ }
+ }
+ }
+ }
+}
+
+void DescriptorSet::ContentsChanged(const Array &descriptorSets, const PipelineLayout *layout)
+{
+ ParseDescriptors(descriptorSets, layout, CONTENTS_CHANGED);
+}
+
+void DescriptorSet::PrepareForSampling(const Array &descriptorSets, const PipelineLayout *layout)
+{
+ ParseDescriptors(descriptorSets, layout, PREPARE_FOR_SAMPLING);
+}
+
+} // namespace vk
\ No newline at end of file
