mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-06-05 22:23:29 +00:00
76732abfe5
Below are the list of all the individual changes, which are a good order in which to review this CL. Core changes: - Change the tracking in the frontend to produce a synchronization scope per dispatch instead of per compute pass. Some bindgroups might not be part of any synchronization scopes so we also track all the referenced resources on the side so they can be checked during Queue::Submit validation. - Fix clearing in the GL and Metal backends to use the per-dispatch synchronization scopes. - Fix the Vulkan backend to use the per dispatch synchronization scopes to produce the correct pipeline barriers. This allows the removal of previous logic that was subtly incorrect for Indirect buffer. This allows the merging of the Compute and Render DescriptorSetTracker into a single small helper class. - D3D12 changes are similar to Vulkan, but the simplification is just a the suppression of a branch with a lot of code in BindGroupStateTracker. Test changes: - Fixup all the ResourceUsageTracking tests to follow the WebGPU spec for synchronization scopes (fixing a lot of TODOs). - Add additional tests checking that Indirect buffers are not allowed to be used as a writeable storage in the same synchronization scope. - Add tests for Queue::Submit validation correctly taking into account resources that are bound but unused in compute passes. - Add an end2end test for using a buffer as Indirect and Storage at the same time in a DispatchIndirect, which would previously produce incorrect barriers in the Vulkan and D3D12 backends. Other small changes (that I was to lazy to put in a different CL): - Add the utils::MakePipelineLayout helper function. - Fix Indirect not being in the list of readonly buffer usages (caught by a test added in this CL). Bug: dawn:632 Change-Id: I77263c3535a4ba995faccbf26255da9a2f6ed3b5 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/49887 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Stephen White <senorblanco@chromium.org>
72 lines
2.8 KiB
C++
72 lines
2.8 KiB
C++
// Copyright 2018 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.
|
|
|
|
#ifndef DAWNNATIVE_COMPUTEPASSENCODER_H_
|
|
#define DAWNNATIVE_COMPUTEPASSENCODER_H_
|
|
|
|
#include "dawn_native/CommandBufferStateTracker.h"
|
|
#include "dawn_native/Error.h"
|
|
#include "dawn_native/PassResourceUsageTracker.h"
|
|
#include "dawn_native/ProgrammablePassEncoder.h"
|
|
|
|
namespace dawn_native {
|
|
|
|
class SyncScopeUsageTracker;
|
|
|
|
class ComputePassEncoder final : public ProgrammablePassEncoder {
|
|
public:
|
|
ComputePassEncoder(DeviceBase* device,
|
|
CommandEncoder* commandEncoder,
|
|
EncodingContext* encodingContext);
|
|
|
|
static ComputePassEncoder* MakeError(DeviceBase* device,
|
|
CommandEncoder* commandEncoder,
|
|
EncodingContext* encodingContext);
|
|
|
|
void APIEndPass();
|
|
|
|
void APIDispatch(uint32_t x, uint32_t y = 1, uint32_t z = 1);
|
|
void APIDispatchIndirect(BufferBase* indirectBuffer, uint64_t indirectOffset);
|
|
void APISetPipeline(ComputePipelineBase* pipeline);
|
|
|
|
void APISetBindGroup(uint32_t groupIndex,
|
|
BindGroupBase* group,
|
|
uint32_t dynamicOffsetCount = 0,
|
|
const uint32_t* dynamicOffsets = nullptr);
|
|
|
|
void APIWriteTimestamp(QuerySetBase* querySet, uint32_t queryIndex);
|
|
|
|
protected:
|
|
ComputePassEncoder(DeviceBase* device,
|
|
CommandEncoder* commandEncoder,
|
|
EncodingContext* encodingContext,
|
|
ErrorTag errorTag);
|
|
|
|
private:
|
|
CommandBufferStateTracker mCommandBufferState;
|
|
|
|
// Adds the bindgroups used for the current dispatch to the SyncScopeResourceUsage and
|
|
// records it in mUsageTracker.
|
|
void AddDispatchSyncScope(SyncScopeUsageTracker scope = {});
|
|
ComputePassResourceUsageTracker mUsageTracker;
|
|
|
|
// For render and compute passes, the encoding context is borrowed from the command encoder.
|
|
// Keep a reference to the encoder to make sure the context isn't freed.
|
|
Ref<CommandEncoder> mCommandEncoder;
|
|
};
|
|
|
|
} // namespace dawn_native
|
|
|
|
#endif // DAWNNATIVE_COMPUTEPASSENCODER_H_
|