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>
diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp
index 2c70721..834ff00 100644
--- a/src/dawn_native/Device.cpp
+++ b/src/dawn_native/Device.cpp
@@ -651,27 +651,6 @@
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) {
ASSERT(obj->IsCachedReference());
size_t removedCount = mCaches->renderPipelines.erase(obj);
@@ -1109,7 +1088,7 @@
// the pipeline will take another reference.
Ref<PipelineLayoutBase> layoutRef;
ComputePipelineDescriptor appliedDescriptor;
- DAWN_TRY_ASSIGN(layoutRef, ValidateAndGetComputePipelineDescriptorWithDefaults(
+ DAWN_TRY_ASSIGN(layoutRef, ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
*descriptor, &appliedDescriptor));
auto pipelineAndBlueprintFromCache = GetCachedComputePipeline(&appliedDescriptor);
@@ -1136,7 +1115,7 @@
// the pipeline will take another reference.
Ref<PipelineLayoutBase> layoutRef;
ComputePipelineDescriptor appliedDescriptor;
- DAWN_TRY_ASSIGN(layoutRef, ValidateAndGetComputePipelineDescriptorWithDefaults(
+ DAWN_TRY_ASSIGN(layoutRef, ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
*descriptor, &appliedDescriptor));
// Call the callback directly when we can get a cached compute pipeline object.
@@ -1157,7 +1136,7 @@
}
ResultOrError<Ref<PipelineLayoutBase>>
- DeviceBase::ValidateAndGetComputePipelineDescriptorWithDefaults(
+ DeviceBase::ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
const ComputePipelineDescriptor& descriptor,
ComputePipelineDescriptor* outDescriptor) {
Ref<PipelineLayoutBase> layoutRef;
@@ -1181,7 +1160,7 @@
}
ResultOrError<Ref<PipelineLayoutBase>>
- DeviceBase::ValidateAndGetRenderPipelineDescriptorWithDefaults(
+ DeviceBase::ValidateLayoutAndGetRenderPipelineDescriptorWithDefaults(
const RenderPipelineDescriptor& descriptor,
RenderPipelineDescriptor* outDescriptor) {
Ref<PipelineLayoutBase> layoutRef;
@@ -1287,20 +1266,22 @@
DAWN_TRY(ValidateRenderPipelineDescriptor(this, descriptor));
}
- if (descriptor->layout == nullptr) {
- RenderPipelineDescriptor descriptorWithDefaultLayout = *descriptor;
+ // Ref will keep the pipeline layout alive until the end of the function where
+ // 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
- // the pipeline will take another reference.
- Ref<PipelineLayoutBase> layoutRef;
- DAWN_TRY_ASSIGN(layoutRef,
- PipelineLayoutBase::CreateDefault(this, GetStages(descriptor)));
- descriptorWithDefaultLayout.layout = layoutRef.Get();
-
- return GetOrCreateRenderPipeline(&descriptorWithDefaultLayout);
- } else {
- return GetOrCreateRenderPipeline(descriptor);
+ auto pipelineAndBlueprintFromCache = GetCachedRenderPipeline(&appliedDescriptor);
+ if (pipelineAndBlueprintFromCache.first.Get() != nullptr) {
+ return std::move(pipelineAndBlueprintFromCache.first);
}
+
+ Ref<RenderPipelineBase> backendObj;
+ DAWN_TRY_ASSIGN(backendObj, CreateRenderPipelineImpl(&appliedDescriptor));
+ size_t blueprintHash = pipelineAndBlueprintFromCache.second;
+ return AddOrGetCachedRenderPipeline(backendObj, blueprintHash);
}
MaybeError DeviceBase::CreateRenderPipelineAsync(const RenderPipelineDescriptor* descriptor,
@@ -1315,7 +1296,7 @@
// the pipeline will take another reference.
Ref<PipelineLayoutBase> layoutRef;
RenderPipelineDescriptor appliedDescriptor;
- DAWN_TRY_ASSIGN(layoutRef, ValidateAndGetRenderPipelineDescriptorWithDefaults(
+ DAWN_TRY_ASSIGN(layoutRef, ValidateLayoutAndGetRenderPipelineDescriptorWithDefaults(
*descriptor, &appliedDescriptor));
// Call the callback directly when we can get a cached render pipeline object.
diff --git a/src/dawn_native/Device.h b/src/dawn_native/Device.h
index a25fbdf..6032988 100644
--- a/src/dawn_native/Device.h
+++ b/src/dawn_native/Device.h
@@ -124,8 +124,6 @@
const PipelineLayoutDescriptor* descriptor);
void UncachePipelineLayout(PipelineLayoutBase* obj);
- ResultOrError<Ref<RenderPipelineBase>> GetOrCreateRenderPipeline(
- const RenderPipelineDescriptor* descriptor);
void UncacheRenderPipeline(RenderPipelineBase* obj);
ResultOrError<Ref<SamplerBase>> GetOrCreateSampler(const SamplerDescriptor* descriptor);
@@ -348,10 +346,12 @@
ResultOrError<Ref<BindGroupLayoutBase>> CreateEmptyBindGroupLayout();
- ResultOrError<Ref<PipelineLayoutBase>> ValidateAndGetComputePipelineDescriptorWithDefaults(
+ ResultOrError<Ref<PipelineLayoutBase>>
+ ValidateLayoutAndGetComputePipelineDescriptorWithDefaults(
const ComputePipelineDescriptor& descriptor,
ComputePipelineDescriptor* outDescriptor);
- ResultOrError<Ref<PipelineLayoutBase>> ValidateAndGetRenderPipelineDescriptorWithDefaults(
+ ResultOrError<Ref<PipelineLayoutBase>>
+ ValidateLayoutAndGetRenderPipelineDescriptorWithDefaults(
const RenderPipelineDescriptor& descriptor,
RenderPipelineDescriptor* outDescriptor);
std::pair<Ref<ComputePipelineBase>, size_t> GetCachedComputePipeline(
