commit 9acdbcba854a3e9e36fa6b1e213ed624d742e818
author Jiawei Shao <jiawei.shao@intel.com> Tue Jan 11 00:19:54 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jan 11 00:19:54 2022 +0000
tree 0ffc4250d830da82611a0203876e4ab996dee4d9
parent 5f7f1b75df4eb7f47b9b193166458f8f33bf3a70

Vulkan: Add StoreOp to the computation of the key of RenderPassCache

This patch adds StoreOp to the computation of key of RenderPassCache,
which was missed in the last CL that fixes a failure of end2end test
on Windows Intel Vulkan drivers.

BUG=dawn:1151

Change-Id: Iec03d70303c89906154db5256fd8691cc018a91a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/75860
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>

src/dawn_native/vulkan/RenderPassCache.cpp

diff --git a/src/dawn_native/vulkan/RenderPassCache.cpp b/src/dawn_native/vulkan/RenderPassCache.cpp
index 588d7ee..091a574 100644
--- a/src/dawn_native/vulkan/RenderPassCache.cpp
+++ b/src/dawn_native/vulkan/RenderPassCache.cpp
@@ -240,13 +240,13 @@
         HashCombine(&hash, Hash(query.resolveTargetMask));
 
         for (ColorAttachmentIndex i : IterateBitSet(query.colorMask)) {
-            HashCombine(&hash, query.colorFormats[i], query.colorLoadOp[i]);
+            HashCombine(&hash, query.colorFormats[i], query.colorLoadOp[i], query.colorStoreOp[i]);
         }
 
         HashCombine(&hash, query.hasDepthStencil);
         if (query.hasDepthStencil) {
-            HashCombine(&hash, query.depthStencilFormat, query.depthLoadOp, query.stencilLoadOp,
-                        query.readOnlyDepthStencil);
+            HashCombine(&hash, query.depthStencilFormat, query.depthLoadOp, query.depthStoreOp,
+                        query.stencilLoadOp, query.stencilStoreOp, query.readOnlyDepthStencil);
         }
 
         HashCombine(&hash, query.sampleCount);