RenderPass now considers clearColor

star-e · Aug 12, 2024 · f2a335d · f2a335d
1 parent a039349
commit f2a335d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/native/cocos/renderer/gfx-base/GFXDef.cpp b/native/cocos/renderer/gfx-base/GFXDef.cpp
@@ -248,6 +248,16 @@ bool operator==(const BufferBarrierInfo &lhs, const BufferBarrierInfo &rhs) {
     return !memcmp(&lhs, &rhs, sizeof(BufferBarrierInfo));
 }
 
+template <>
+ccstd::hash_t Hasher<Color>::operator()(const Color &info) const {
+    ccstd::hash_t seed = 0;
+    ccstd::hash_combine(seed, info.x);
+    ccstd::hash_combine(seed, info.y);
+    ccstd::hash_combine(seed, info.z);
+    ccstd::hash_combine(seed, info.w);
+    return seed;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 bool operator==(const Viewport &lhs, const Viewport &rhs) {

diff --git a/native/cocos/renderer/pipeline/custom/RenderGraphTypes.h b/native/cocos/renderer/pipeline/custom/RenderGraphTypes.h
@@ -108,8 +108,8 @@ struct RasterView {
 };
 
 inline bool operator==(const RasterView& lhs, const RasterView& rhs) noexcept {
-    return std::forward_as_tuple(lhs.slotName, lhs.slotName1, lhs.accessType, lhs.attachmentType, lhs.loadOp, lhs.storeOp, lhs.clearFlags, lhs.shaderStageFlags) ==
-           std::forward_as_tuple(rhs.slotName, rhs.slotName1, rhs.accessType, rhs.attachmentType, rhs.loadOp, rhs.storeOp, rhs.clearFlags, rhs.shaderStageFlags);
+    return std::forward_as_tuple(lhs.slotName, lhs.slotName1, lhs.accessType, lhs.attachmentType, lhs.loadOp, lhs.storeOp, lhs.clearFlags, lhs.clearColor, lhs.shaderStageFlags) ==
+           std::forward_as_tuple(rhs.slotName, rhs.slotName1, rhs.accessType, rhs.attachmentType, rhs.loadOp, rhs.storeOp, rhs.clearFlags, rhs.clearColor, rhs.shaderStageFlags);
 }
 
 inline bool operator!=(const RasterView& lhs, const RasterView& rhs) noexcept {
@@ -1219,6 +1219,7 @@ inline hash_t hash<cc::render::RasterView>::operator()(const cc::render::RasterV
     hash_combine(seed, val.loadOp);
     hash_combine(seed, val.storeOp);
     hash_combine(seed, val.clearFlags);
+    hash_combine(seed, val.clearColor);
     hash_combine(seed, val.shaderStageFlags);
     return seed;
 }