commit c48e35b94aa3ed30a6e332c449b48a6958b164e9
author Peng Huang <penghuang@chromium.org> Fri Feb 04 01:44:36 2022
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 04 16:42:06 2022
tree 4f7551b83b0efe4e5f23de4c0944048933eafa3f
parent 2b00f4f5a637bef1ec680266ad0305647a1d63b6

Add more info in BlitFramebuffer error message

Bug: chromium:1290638
Change-Id: Id1faab26df2f19b90ec85aff6852334e8fda03ce
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3436326
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

src/libANGLE/ErrorStrings.h

diff --git a/src/libANGLE/ErrorStrings.h b/src/libANGLE/ErrorStrings.h
index 7eb80e0..09312dd 100644
--- a/src/libANGLE/ErrorStrings.h
+++ b/src/libANGLE/ErrorStrings.h
@@ -26,7 +26,7 @@
 MSG kBlitDepthOrStencilFormatMismatch = "Depth/stencil buffer format combination not allowed for blit.";
 MSG kBlitDimensionsOutOfRange = "BlitFramebuffer dimensions out of 32-bit integer range.";
 MSG kBlitExtensionDepthStencilWholeBufferBlit = "Only whole-buffer depth and stencil blits are supported by this extension.";
-MSG kBlitExtensionFormatMismatch = "Attempting to blit and the read and draw buffer formats don't match.";
+MSG kBlitExtensionFormatMismatch = "Attempting to blit and the read and draw buffer formats don't match. read: 0x%04X draw: 0x%04X";
 MSG kBlitExtensionFromInvalidAttachmentType = "Blits are only supported from 2D texture, renderbuffer or default framebuffer attachments in this extension.";
 MSG kBlitExtensionLinear = "Linear blit not supported in this extension.";
 MSG kBlitExtensionMultisampledDepthOrStencil = "Multisampled depth/stencil blit is not supported by this extension.";

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 988d324..f8a8006 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -2489,8 +2489,10 @@
                     if (!Format::EquivalentForBlit(attachment->getFormat(),
                                                    readColorAttachment->getFormat()))
                     {
-                        context->validationError(entryPoint, GL_INVALID_OPERATION,
-                                                 kBlitExtensionFormatMismatch);
+                        context->validationErrorF(
+                            entryPoint, GL_INVALID_OPERATION, kBlitExtensionFormatMismatch,
+                            readColorAttachment->getFormat().info->sizedInternalFormat,
+                            attachment->getFormat().info->sizedInternalFormat);
                         return false;
                     }
                 }