diff --git a/src/intel/ci/angle-anv-adl-fails.txt b/src/intel/ci/angle-anv-adl-fails.txt
index 0466068513a..e69de29bb2d 100644
--- a/src/intel/ci/angle-anv-adl-fails.txt
+++ b/src/intel/ci/angle-anv-adl-fails.txt
@@ -1,2 +0,0 @@
-# New failures with ES CTS 3.2.12.0
-KHR-GLES3.framebuffer_blit.scissor_blit,Fail
diff --git a/src/intel/ci/angle-anv-jsl-fails.txt b/src/intel/ci/angle-anv-jsl-fails.txt
index ab8efdce645..71668615d67 100644
--- a/src/intel/ci/angle-anv-jsl-fails.txt
+++ b/src/intel/ci/angle-anv-jsl-fails.txt
@@ -13,6 +13,3 @@ KHR-GLES31.core.texture_border_clamp.Texture2DDC16Linear,Fail
 
 # new with ANGLE 2024-10-17
 KHR-GLES31.core.blend_equation_advanced.test_coherency.multiplySequence,Fail
-
-# New failures with ES CTS 3.2.12.0
-KHR-GLES3.framebuffer_blit.scissor_blit,Fail
diff --git a/src/intel/ci/angle-anv-tgl-fails.txt b/src/intel/ci/angle-anv-tgl-fails.txt
index 0466068513a..e69de29bb2d 100644
--- a/src/intel/ci/angle-anv-tgl-fails.txt
+++ b/src/intel/ci/angle-anv-tgl-fails.txt
@@ -1,2 +0,0 @@
-# New failures with ES CTS 3.2.12.0
-KHR-GLES3.framebuffer_blit.scissor_blit,Fail
diff --git a/src/intel/vulkan/anv_shader_compile.c b/src/intel/vulkan/anv_shader_compile.c
index 2cd612cffad..e44ec68654e 100644
--- a/src/intel/vulkan/anv_shader_compile.c
+++ b/src/intel/vulkan/anv_shader_compile.c
@@ -395,8 +395,14 @@ rp_color_mask(const struct vk_graphics_pipeline_state *state)
 
    uint32_t color_mask = 0;
    for (uint32_t i = 0; i < state->rp->color_attachment_count; i++) {
-      if (state->rp->color_attachment_formats[i] != VK_FORMAT_UNDEFINED)
-         color_mask |= BITFIELD_BIT(i);
+      if (state->rp->color_attachment_formats[i] != VK_FORMAT_UNDEFINED) {
+         if (state->cal) {
+            if (state->cal->color_map[i] != MESA_VK_ATTACHMENT_UNUSED)
+               color_mask |= BITFIELD_BIT(state->cal->color_map[i]);
+         } else {
+            color_mask |= BITFIELD_BIT(i);
+         }
+      }
    }
 
    return color_mask;