diff --git a/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.cpp b/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.cpp
index 1cbb90d6..474917c1 100644
--- a/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.cpp
+++ b/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.cpp
@@ -258,8 +258,9 @@ namespace skyline::gpu {
             },
             GetPipeline(gpu,
                         {dstImageView->format->vkFormat,
-                         vk::Format::eUndefined, false, false, 0,
-                         VkColorComponentFlags{vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA}},
+                         vk::Format::eUndefined, 0,
+                         VkColorComponentFlags{vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA},
+                         false, false},
                         {blit::SamplerLayoutBinding}, blit::PushConstantRanges),
             dstImageDimensions
         )};
@@ -358,9 +359,9 @@ namespace skyline::gpu {
             GetPipeline(gpu,
                         {writeColor ? dstImageView->format->vkFormat : vk::Format::eUndefined,
                          (writeDepth || writeStencil) ? dstImageView->format->vkFormat : vk::Format::eUndefined,
-                         writeDepth, writeStencil,
                          value.depthStencil.stencil,
-                         VkColorComponentFlags{components}},
+                         VkColorComponentFlags{components},
+                         writeDepth, writeStencil},
                          {}, clear::PushConstantRanges),
             dstImageView->texture->dimensions
         )};
diff --git a/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.h b/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.h
index b7a26593..b9b68afb 100644
--- a/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.h
+++ b/app/src/main/cpp/skyline/gpu/shaders/helper_shaders.h
@@ -26,12 +26,14 @@ namespace skyline::gpu {
         struct PipelineState {
             vk::Format colorFormat;
             vk::Format depthFormat;
-            bool depthWrite;
-            bool stencilWrite;
             u32 stencilValue;
             VkColorComponentFlags colorWriteMask;
+            bool depthWrite;
+            bool stencilWrite;
 
-            bool operator<=>(const PipelineState &) const = default;
+            bool operator==(const PipelineState &input) const {
+                return std::memcmp(this, &input, sizeof(PipelineState)) == 0;
+            }
         };
 
         std::unordered_map<PipelineState, cache::GraphicsPipelineCache::CompiledPipeline, util::ObjectHash<PipelineState>> pipelineCache;