[Impeller] Add depth settings to pipeline variant hash.

Author: bdero

impeller/entity/contents/clip_contents.cc

@@ -83,8 +83,6 @@ bool ClipContents::Render(const ContentContext& renderer,
   auto options = OptionsFromPass(pass);
   options.blend_mode = BlendMode::kDestination;
   pass.SetStencilReference(entity.GetClipDepth());
-  options.stencil_compare = CompareFunction::kEqual;
-  options.stencil_operation = StencilOperation::kIncrementClamp;
 
   if (clip_op_ == Entity::ClipOperation::kDifference) {
     {

impeller/entity/contents/content_context.cc

@@ -141,6 +141,14 @@ void ContentContextOptions::ApplyToPipelineDescriptor(
     desc.ClearStencilAttachments();
   }
 
+  auto maybe_depth = desc.GetDepthStencilAttachmentDescriptor();
+  if (maybe_depth.has_value()) {
+    DepthAttachmentDescriptor depth = maybe_depth.value();
+    depth.depth_write_enabled = depth_write_enabled;
+    depth.depth_compare = depth_compare;
+    desc.SetDepthStencilAttachmentDescriptor(depth);
+  }
+
   auto maybe_stencil = desc.GetFrontStencilAttachmentDescriptor();
   if (maybe_stencil.has_value()) {
     StencilAttachmentDescriptor stencil = maybe_stencil.value();

impeller/entity/contents/content_context.h

@@ -281,11 +281,13 @@ using TiledTextureExternalPipeline =
 struct ContentContextOptions {
   SampleCount sample_count = SampleCount::kCount1;
   BlendMode blend_mode = BlendMode::kSourceOver;
+  CompareFunction depth_compare = CompareFunction::kGreater;
   CompareFunction stencil_compare = CompareFunction::kEqual;
   StencilOperation stencil_operation = StencilOperation::kKeep;
   PrimitiveType primitive_type = PrimitiveType::kTriangle;
   PixelFormat color_attachment_pixel_format = PixelFormat::kUnknown;
   bool has_depth_stencil_attachments = true;
+  bool depth_write_enabled = false;
   bool wireframe = false;
   bool is_for_rrect_blur_clear = false;
 
@@ -294,6 +296,7 @@ struct ContentContextOptions {
       static_assert(sizeof(o.sample_count) == 1);
       static_assert(sizeof(o.blend_mode) == 1);
       static_assert(sizeof(o.sample_count) == 1);
+      static_assert(sizeof(o.depth_compare) == 1);
       static_assert(sizeof(o.stencil_compare) == 1);
       static_assert(sizeof(o.stencil_operation) == 1);
       static_assert(sizeof(o.primitive_type) == 1);
@@ -302,11 +305,13 @@ struct ContentContextOptions {
       return (o.is_for_rrect_blur_clear ? 1llu : 0llu) << 0 |
              (o.wireframe ? 1llu : 0llu) << 1 |
              (o.has_depth_stencil_attachments ? 1llu : 0llu) << 2 |
+             (o.depth_write_enabled ? 1llu : 0llu) << 3 |
              // enums
-             static_cast<uint64_t>(o.color_attachment_pixel_format) << 16 |
-             static_cast<uint64_t>(o.primitive_type) << 24 |
-             static_cast<uint64_t>(o.stencil_operation) << 32 |
-             static_cast<uint64_t>(o.stencil_compare) << 40 |
+             static_cast<uint64_t>(o.color_attachment_pixel_format) << 8 |
+             static_cast<uint64_t>(o.primitive_type) << 16 |
+             static_cast<uint64_t>(o.stencil_operation) << 24 |
+             static_cast<uint64_t>(o.stencil_compare) << 32 |
+             static_cast<uint64_t>(o.depth_compare) << 40 |
              static_cast<uint64_t>(o.blend_mode) << 48 |
              static_cast<uint64_t>(o.sample_count) << 56;
     }
@@ -317,6 +322,8 @@ struct ContentContextOptions {
                               const ContentContextOptions& rhs) const {
       return lhs.sample_count == rhs.sample_count &&
              lhs.blend_mode == rhs.blend_mode &&
+             lhs.depth_write_enabled == rhs.depth_write_enabled &&
+             lhs.depth_compare == rhs.depth_compare &&
              lhs.stencil_compare == rhs.stencil_compare &&
              lhs.stencil_operation == rhs.stencil_operation &&
              lhs.primitive_type == rhs.primitive_type &&
@@ -822,6 +829,10 @@ class ContentContext {
         VALIDATION_LOG << "Failed to create default pipeline.";
         return;
       }
+      PixelFormat depth_stencil_format =
+          context.GetCapabilities()->GetDefaultDepthStencilFormat();
+      desc->SetDepthPixelFormat(depth_stencil_format);
+      desc->SetStencilPixelFormat(depth_stencil_format);
       desc->SetUseSubpassInput(subpass_input);
       options.ApplyToPipelineDescriptor(*desc);
       SetDefault(options, std::make_unique<PipelineT>(context, desc));