mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-08-20 10:51:32 +00:00
045bb95973
The global resource usage was used for two things: - Validating that the texture had the required usage, but this was removed in a previous commit in favor of checking the texture's usage at the encoding entrypoint. - Skipping laz-clearing of the texture if it was used as RenderAttachment. This was incorrect and would skip clearing of all of the texture's subresource as long as one of them was used as RenderAttachment. This commit make PassTextureUsage exactly a SubresourceStorage<TextureUsage> and fixes the logic for skipping the clearing or RenderAttachment. It also adds a regression test for the lazy clearing fix. Bug: dawn:635 Change-Id: I5d984febb3e5a5f9ae15b632cac68e294555c4e6 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/38382 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Stephen White <senorblanco@chromium.org> Auto-Submit: Corentin Wallez <cwallez@chromium.org>
94 lines
3.9 KiB
C++
94 lines
3.9 KiB
C++
// Copyright 2019 The Dawn Authors
|
|
//
|
|
// 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 "dawn_native/PassResourceUsageTracker.h"
|
|
|
|
#include "dawn_native/Buffer.h"
|
|
#include "dawn_native/EnumMaskIterator.h"
|
|
#include "dawn_native/Format.h"
|
|
#include "dawn_native/Texture.h"
|
|
|
|
#include <utility>
|
|
|
|
namespace dawn_native {
|
|
PassResourceUsageTracker::PassResourceUsageTracker(PassType passType) : mPassType(passType) {
|
|
}
|
|
|
|
void PassResourceUsageTracker::BufferUsedAs(BufferBase* buffer, wgpu::BufferUsage usage) {
|
|
// std::map's operator[] will create the key and return 0 if the key didn't exist
|
|
// before.
|
|
mBufferUsages[buffer] |= usage;
|
|
}
|
|
|
|
void PassResourceUsageTracker::TextureViewUsedAs(TextureViewBase* view,
|
|
wgpu::TextureUsage usage) {
|
|
TextureBase* texture = view->GetTexture();
|
|
const SubresourceRange& range = view->GetSubresourceRange();
|
|
|
|
// Get or create a new PassTextureUsage for that texture (initially filled with
|
|
// wgpu::TextureUsage::None)
|
|
auto it = mTextureUsages.emplace(
|
|
std::piecewise_construct, std::forward_as_tuple(texture),
|
|
std::forward_as_tuple(texture->GetFormat().aspects, texture->GetArrayLayers(),
|
|
texture->GetNumMipLevels(), wgpu::TextureUsage::None));
|
|
PassTextureUsage& textureUsage = it.first->second;
|
|
|
|
textureUsage.Update(range,
|
|
[usage](const SubresourceRange&, wgpu::TextureUsage* storedUsage) {
|
|
*storedUsage |= usage;
|
|
});
|
|
}
|
|
|
|
void PassResourceUsageTracker::AddTextureUsage(TextureBase* texture,
|
|
const PassTextureUsage& textureUsage) {
|
|
// Get or create a new PassTextureUsage for that texture (initially filled with
|
|
// wgpu::TextureUsage::None)
|
|
auto it = mTextureUsages.emplace(
|
|
std::piecewise_construct, std::forward_as_tuple(texture),
|
|
std::forward_as_tuple(texture->GetFormat().aspects, texture->GetArrayLayers(),
|
|
texture->GetNumMipLevels(), wgpu::TextureUsage::None));
|
|
PassTextureUsage* passTextureUsage = &it.first->second;
|
|
|
|
passTextureUsage->Merge(
|
|
textureUsage, [](const SubresourceRange&, wgpu::TextureUsage* storedUsage,
|
|
const wgpu::TextureUsage& addedUsage) { *storedUsage |= addedUsage; });
|
|
}
|
|
|
|
// Returns the per-pass usage for use by backends for APIs with explicit barriers.
|
|
PassResourceUsage PassResourceUsageTracker::AcquireResourceUsage() {
|
|
PassResourceUsage result;
|
|
result.passType = mPassType;
|
|
result.buffers.reserve(mBufferUsages.size());
|
|
result.bufferUsages.reserve(mBufferUsages.size());
|
|
result.textures.reserve(mTextureUsages.size());
|
|
result.textureUsages.reserve(mTextureUsages.size());
|
|
|
|
for (auto& it : mBufferUsages) {
|
|
result.buffers.push_back(it.first);
|
|
result.bufferUsages.push_back(it.second);
|
|
}
|
|
|
|
for (auto& it : mTextureUsages) {
|
|
result.textures.push_back(it.first);
|
|
result.textureUsages.push_back(std::move(it.second));
|
|
}
|
|
|
|
mBufferUsages.clear();
|
|
mTextureUsages.clear();
|
|
|
|
return result;
|
|
}
|
|
|
|
} // namespace dawn_native
|