From 8d15acb11d7e1cc6471f55fb0f1ae4e8600c4858 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Tue, 29 Sep 2020 01:34:04 -0400
Subject: [PATCH] CCameraFilter: Disable depth_write for FilterPipelines

---
 Runtime/Camera/CCameraFilter.hpp              | 21 ++++++++++++-------
 .../Graphics/Shaders/CCameraBlurFilter.cpp    |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Runtime/Camera/CCameraFilter.hpp b/Runtime/Camera/CCameraFilter.hpp
index e3f8cbfda..1f5ffa78c 100644
--- a/Runtime/Camera/CCameraFilter.hpp
+++ b/Runtime/Camera/CCameraFilter.hpp
@@ -28,31 +28,38 @@ enum class EFilterType {
 };
 
 template <EFilterType FT, hsh::Compare ZComp = hsh::Always>
-struct FilterPipeline : hsh::pipeline::pipeline<hsh::pipeline::color_attachment<>> {};
+struct FilterPipeline : hsh::pipeline::pipeline<hsh::pipeline::color_attachment<>,
+                                                hsh::pipeline::depth_write<false>> {};
 
 template <hsh::Compare ZComp>
 struct FilterPipeline<EFilterType::Passthru, ZComp>
-: hsh::pipeline::pipeline<hsh::pipeline::color_attachment<>, hsh::pipeline::depth_compare<ZComp>> {};
+: hsh::pipeline::pipeline<hsh::pipeline::color_attachment<>, hsh::pipeline::depth_compare<ZComp>,
+                          hsh::pipeline::depth_write<false>> {};
 
 template <hsh::Compare ZComp>
 struct FilterPipeline<EFilterType::Multiply, ZComp>
-: hsh::pipeline::pipeline<MultiplyAttachment<false>, hsh::pipeline::depth_compare<ZComp>> {};
+: hsh::pipeline::pipeline<MultiplyAttachment<false>, hsh::pipeline::depth_compare<ZComp>,
+                          hsh::pipeline::depth_write<false>> {};
 
 template <hsh::Compare ZComp>
 struct FilterPipeline<EFilterType::Add, ZComp>
-: hsh::pipeline::pipeline<AdditiveAttachment<false>, hsh::pipeline::depth_compare<ZComp>> {};
+: hsh::pipeline::pipeline<AdditiveAttachment<false>, hsh::pipeline::depth_compare<ZComp>,
+                          hsh::pipeline::depth_write<false>> {};
 
 template <hsh::Compare ZComp>
 struct FilterPipeline<EFilterType::Blend, ZComp>
-: hsh::pipeline::pipeline<BlendAttachment<false>, hsh::pipeline::depth_compare<ZComp>> {};
+: hsh::pipeline::pipeline<BlendAttachment<false>, hsh::pipeline::depth_compare<ZComp>,
+                          hsh::pipeline::depth_write<false>> {};
 
 template <hsh::Compare ZComp>
 struct FilterPipeline<EFilterType::NoColor, ZComp>
-: hsh::pipeline::pipeline<NoColorAttachmentExt<AlphaMode::AlphaReplace>, hsh::pipeline::depth_compare<ZComp>> {};
+: hsh::pipeline::pipeline<NoColorAttachmentExt<AlphaMode::AlphaReplace>, hsh::pipeline::depth_compare<ZComp>,
+                          hsh::pipeline::depth_write<false>> {};
 
 template <hsh::Compare ZComp>
 struct FilterPipeline<EFilterType::InvDstMultiply, ZComp>
-: hsh::pipeline::pipeline<InvDstMultiplyAttachmentExt<AlphaMode::AlphaReplace>, hsh::pipeline::depth_compare<ZComp>> {};
+: hsh::pipeline::pipeline<InvDstMultiplyAttachmentExt<AlphaMode::AlphaReplace>, hsh::pipeline::depth_compare<ZComp>,
+                          hsh::pipeline::depth_write<false>> {};
 
 enum class EFilterShape {
   Fullscreen,
diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp
index eadaed822..33421d0be 100644
--- a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp
+++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp
@@ -1,9 +1,9 @@
 #include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp"
 
-#include <algorithm>
 #include <array>
 #include <cmath>
 
+#include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 
 #include "CCameraBlurFilter.cpp.hshhead"
@@ -11,7 +11,7 @@
 namespace urde {
 using namespace hsh::pipeline;
 
-struct CCameraBlurFilterPipeline : pipeline<BlendAttachment<>, depth_write<false>> {
+struct CCameraBlurFilterPipeline : FilterPipeline<EFilterType::Blend> {
   CCameraBlurFilterPipeline(hsh::vertex_buffer<CCameraBlurFilter::Vert> vbo,
                             hsh::uniform_buffer<CCameraBlurFilter::Uniform> ubo,
                             hsh::render_texture2d tex) {