encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant code in CreateRenderPipeline 

This patch removes the redundant code in CreateRenderPipeline so
that we can better share the common code in both CreateRenderPipeline
and CreateRenderPipelineAsync.

BUG=dawn:529

Change-Id: Ic2a7781525e5594da3d51a42b231df63c0c09339
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/62880
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
This commit is contained in:
Jiawei Shao 2021-08-31 07:47:57 +00:00 committed by Dawn LUCI CQ
parent c7226a7624
commit 67fc6aeb82
2 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/dawn_native/Device.cpp
View File

@ -651,27 +651,6 @@ namespace dawn_native {
ASSERT(removedCount == 1); ASSERT(removedCount == 1);
} }
ResultOrError<Ref<RenderPipelineBase>> DeviceBase::GetOrCreateRenderPipeline(
const RenderPipelineDescriptor* descriptor) {
RenderPipelineBase blueprint(this, descriptor);
const size_t blueprintHash = blueprint.ComputeContentHash();
blueprint.SetContentHash(blueprintHash);
Ref<RenderPipelineBase> result;
auto iter = mCaches->renderPipelines.find(&blueprint);
if (iter != mCaches->renderPipelines.end()) {
result = *iter;
} else {
DAWN_TRY_ASSIGN(result, CreateRenderPipelineImpl(descriptor));
result->SetIsCachedReference();
result->SetContentHash(blueprintHash);
mCaches->renderPipelines.insert(result.Get());
}
return std::move(result);
}
void DeviceBase::UncacheRenderPipeline(RenderPipelineBase* obj) { void DeviceBase::UncacheRenderPipeline(RenderPipelineBase* obj) {
ASSERT(obj->IsCachedReference()); ASSERT(obj->IsCachedReference());
size_t removedCount = mCaches->renderPipelines.erase(obj); size_t removedCount = mCaches->renderPipelines.erase(obj);
@ -1109,7 +1088,7 @@ namespace dawn_native {
// the pipeline will take another reference. // the pipeline will take another reference.
Ref<PipelineLayoutBase> layoutRef; Ref<PipelineLayoutBase> layoutRef;
ComputePipelineDescriptor appliedDescriptor; ComputePipelineDescriptor appliedDescriptor;
DAWN_TRY_ASSIGN(layoutRef, ValidateAndGetComputePipelineDescriptorWithDefaults( DAWN_TRY_ASSIGN(layoutRef, ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
*descriptor, &appliedDescriptor)); *descriptor, &appliedDescriptor));
auto pipelineAndBlueprintFromCache = GetCachedComputePipeline(&appliedDescriptor); auto pipelineAndBlueprintFromCache = GetCachedComputePipeline(&appliedDescriptor);
@ -1136,7 +1115,7 @@ namespace dawn_native {
// the pipeline will take another reference. // the pipeline will take another reference.
Ref<PipelineLayoutBase> layoutRef; Ref<PipelineLayoutBase> layoutRef;
ComputePipelineDescriptor appliedDescriptor; ComputePipelineDescriptor appliedDescriptor;
DAWN_TRY_ASSIGN(layoutRef, ValidateAndGetComputePipelineDescriptorWithDefaults( DAWN_TRY_ASSIGN(layoutRef, ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
*descriptor, &appliedDescriptor)); *descriptor, &appliedDescriptor));
// Call the callback directly when we can get a cached compute pipeline object. // Call the callback directly when we can get a cached compute pipeline object.
@ -1157,7 +1136,7 @@ namespace dawn_native {
} }
ResultOrError<Ref<PipelineLayoutBase>> ResultOrError<Ref<PipelineLayoutBase>>
DeviceBase::ValidateAndGetComputePipelineDescriptorWithDefaults( DeviceBase::ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
const ComputePipelineDescriptor& descriptor, const ComputePipelineDescriptor& descriptor,
ComputePipelineDescriptor* outDescriptor) { ComputePipelineDescriptor* outDescriptor) {
Ref<PipelineLayoutBase> layoutRef; Ref<PipelineLayoutBase> layoutRef;
@ -1181,7 +1160,7 @@ namespace dawn_native {
} }
ResultOrError<Ref<PipelineLayoutBase>> ResultOrError<Ref<PipelineLayoutBase>>
DeviceBase::ValidateAndGetRenderPipelineDescriptorWithDefaults( DeviceBase::ValidateLayoutAndGetRenderPipelineDescriptorWithDefaults(
const RenderPipelineDescriptor& descriptor, const RenderPipelineDescriptor& descriptor,
RenderPipelineDescriptor* outDescriptor) { RenderPipelineDescriptor* outDescriptor) {
Ref<PipelineLayoutBase> layoutRef; Ref<PipelineLayoutBase> layoutRef;
@ -1287,20 +1266,22 @@ namespace dawn_native {
DAWN_TRY(ValidateRenderPipelineDescriptor(this, descriptor)); DAWN_TRY(ValidateRenderPipelineDescriptor(this, descriptor));
} }
if (descriptor->layout == nullptr) { // Ref will keep the pipeline layout alive until the end of the function where
RenderPipelineDescriptor descriptorWithDefaultLayout = *descriptor; // the pipeline will take another reference.
Ref<PipelineLayoutBase> layoutRef;
RenderPipelineDescriptor appliedDescriptor;
DAWN_TRY_ASSIGN(layoutRef, ValidateLayoutAndGetRenderPipelineDescriptorWithDefaults(
*descriptor, &appliedDescriptor));
// Ref will keep the pipeline layout alive until the end of the function where auto pipelineAndBlueprintFromCache = GetCachedRenderPipeline(&appliedDescriptor);
// the pipeline will take another reference. if (pipelineAndBlueprintFromCache.first.Get() != nullptr) {
Ref<PipelineLayoutBase> layoutRef; return std::move(pipelineAndBlueprintFromCache.first);
DAWN_TRY_ASSIGN(layoutRef,
PipelineLayoutBase::CreateDefault(this, GetStages(descriptor)));
descriptorWithDefaultLayout.layout = layoutRef.Get();
return GetOrCreateRenderPipeline(&descriptorWithDefaultLayout);
} else {
return GetOrCreateRenderPipeline(descriptor);
} }
Ref<RenderPipelineBase> backendObj;
DAWN_TRY_ASSIGN(backendObj, CreateRenderPipelineImpl(&appliedDescriptor));
size_t blueprintHash = pipelineAndBlueprintFromCache.second;
return AddOrGetCachedRenderPipeline(backendObj, blueprintHash);
} }
MaybeError DeviceBase::CreateRenderPipelineAsync(const RenderPipelineDescriptor* descriptor, MaybeError DeviceBase::CreateRenderPipelineAsync(const RenderPipelineDescriptor* descriptor,
@ -1315,7 +1296,7 @@ namespace dawn_native {
// the pipeline will take another reference. // the pipeline will take another reference.
Ref<PipelineLayoutBase> layoutRef; Ref<PipelineLayoutBase> layoutRef;
RenderPipelineDescriptor appliedDescriptor; RenderPipelineDescriptor appliedDescriptor;
DAWN_TRY_ASSIGN(layoutRef, ValidateAndGetRenderPipelineDescriptorWithDefaults( DAWN_TRY_ASSIGN(layoutRef, ValidateLayoutAndGetRenderPipelineDescriptorWithDefaults(
*descriptor, &appliedDescriptor)); *descriptor, &appliedDescriptor));
// Call the callback directly when we can get a cached render pipeline object. // Call the callback directly when we can get a cached render pipeline object.

8
src/dawn_native/Device.h
View File

@ -124,8 +124,6 @@ namespace dawn_native {
const PipelineLayoutDescriptor* descriptor); const PipelineLayoutDescriptor* descriptor);
void UncachePipelineLayout(PipelineLayoutBase* obj); void UncachePipelineLayout(PipelineLayoutBase* obj);
ResultOrError<Ref<RenderPipelineBase>> GetOrCreateRenderPipeline(
const RenderPipelineDescriptor* descriptor);
void UncacheRenderPipeline(RenderPipelineBase* obj); void UncacheRenderPipeline(RenderPipelineBase* obj);
ResultOrError<Ref<SamplerBase>> GetOrCreateSampler(const SamplerDescriptor* descriptor); ResultOrError<Ref<SamplerBase>> GetOrCreateSampler(const SamplerDescriptor* descriptor);
@ -348,10 +346,12 @@ namespace dawn_native {
ResultOrError<Ref<BindGroupLayoutBase>> CreateEmptyBindGroupLayout(); ResultOrError<Ref<BindGroupLayoutBase>> CreateEmptyBindGroupLayout();
ResultOrError<Ref<PipelineLayoutBase>> ValidateAndGetComputePipelineDescriptorWithDefaults( ResultOrError<Ref<PipelineLayoutBase>>
ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
const ComputePipelineDescriptor& descriptor, const ComputePipelineDescriptor& descriptor,
ComputePipelineDescriptor* outDescriptor); ComputePipelineDescriptor* outDescriptor);
ResultOrError<Ref<PipelineLayoutBase>> ValidateAndGetRenderPipelineDescriptorWithDefaults( ResultOrError<Ref<PipelineLayoutBase>>
ValidateLayoutAndGetRenderPipelineDescriptorWithDefaults(
const RenderPipelineDescriptor& descriptor, const RenderPipelineDescriptor& descriptor,
RenderPipelineDescriptor* outDescriptor); RenderPipelineDescriptor* outDescriptor);
std::pair<Ref<ComputePipelineBase>, size_t> GetCachedComputePipeline( std::pair<Ref<ComputePipelineBase>, size_t> GetCachedComputePipeline(