commit 1152bbaf8e143ee00d6ea11f0713de6c41ead2b7
author Corentin Wallez <cwallez@chromium.org> Wed May 01 13:48:47 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Wed May 01 13:48:47 2019 +0000
tree a0493ec8a53c7659dc5ce36407fe89cf9fdb08ce
parent c535198d96f9047bf14c603677449326d0f1342a

dawn_native: deduplicate compute pipelines

BUG=dawn:143

Change-Id: I64e4660de2241bb72bb7c615a0bd1e675e043295
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/6863
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>

src/dawn_native/ComputePipeline.cpp

diff --git a/src/dawn_native/ComputePipeline.cpp b/src/dawn_native/ComputePipeline.cpp
index a2fb60f..0ae29119 100644
--- a/src/dawn_native/ComputePipeline.cpp
+++ b/src/dawn_native/ComputePipeline.cpp
@@ -14,6 +14,7 @@
 
 #include "dawn_native/ComputePipeline.h"
 
+#include "common/HashUtils.h"
 #include "dawn_native/Device.h"
 
 namespace dawn_native {
@@ -33,8 +34,12 @@
     // ComputePipelineBase
 
     ComputePipelineBase::ComputePipelineBase(DeviceBase* device,
-                                             const ComputePipelineDescriptor* descriptor)
-        : PipelineBase(device, descriptor->layout, dawn::ShaderStageBit::Compute) {
+                                             const ComputePipelineDescriptor* descriptor,
+                                             bool blueprint)
+        : PipelineBase(device, descriptor->layout, dawn::ShaderStageBit::Compute),
+          mModule(descriptor->computeStage->module),
+          mEntryPoint(descriptor->computeStage->entryPoint),
+          mIsBlueprint(blueprint) {
         ExtractModuleData(dawn::ShaderStage::Compute, descriptor->computeStage->module);
     }
 
@@ -42,9 +47,29 @@
         : PipelineBase(device, tag) {
     }
 
+    ComputePipelineBase::~ComputePipelineBase() {
+        // Do not uncache the actual cached object if we are a blueprint
+        if (!mIsBlueprint) {
+            ASSERT(!IsError());
+            GetDevice()->UncacheComputePipeline(this);
+        }
+    }
+
     // static
     ComputePipelineBase* ComputePipelineBase::MakeError(DeviceBase* device) {
         return new ComputePipelineBase(device, ObjectBase::kError);
     }
 
+    size_t ComputePipelineBase::HashFunc::operator()(const ComputePipelineBase* pipeline) const {
+        size_t hash = 0;
+        HashCombine(&hash, pipeline->mModule.Get(), pipeline->mEntryPoint, pipeline->GetLayout());
+        return hash;
+    }
+
+    bool ComputePipelineBase::EqualityFunc::operator()(const ComputePipelineBase* a,
+                                                       const ComputePipelineBase* b) const {
+        return a->mModule.Get() == b->mModule.Get() && a->mEntryPoint == b->mEntryPoint &&
+               a->GetLayout() == b->GetLayout();
+    }
+
 }  // namespace dawn_native