From a79b2aebf5fcd3027f45358a73f78b6d5b1b9d51 Mon Sep 17 00:00:00 2001
From: Kelsey Gilbert <kelsey.gilbert@mozilla.com>
Date: Wed, 3 Apr 2024 17:01:28 -0700
Subject: [PATCH] [webgl2 spec] "shader-output-incompatible" draw buffer
 validation. (#3626)

* [webgl2 spec] "shader-output-incompatible" draw buffer validation.

Fixes #3623.
---
 specs/latest/2.0/index.html | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/specs/latest/2.0/index.html b/specs/latest/2.0/index.html
index af8f81134..b7c2c0a91 100644
--- a/specs/latest/2.0/index.html
+++ b/specs/latest/2.0/index.html
@@ -3720,16 +3720,26 @@ <h3>Draw Buffers</h3>
     </div>
 
     <p>
-        If the values written by the fragment shader do not match the format(s) of the corresponding
-        color buffer(s) (for example, the output variable is an integer, but the corresponding color
-        buffer has a floating-point format, or vice versa), and the color buffer states are not set to
-        <code>NONE</code> by <code>DrawBuffers</code>, draws generate an <code>INVALID_OPERATION</code> error;
-        if the color buffer states are set to <code>NONE</code> by <code>DrawBuffers</code>, they remain untouched.
+        A draw buffer is "shader-output-incompatible" with a fragment shader if:
+        <ul>
+          <li>the values written to it by the shader do not match the format of the corresponding color buffer
+            (For example, the output variable is an integer, but the corresponding color buffer has a floating-point format, or vice versa)
+          </li>
+          <li>OR there is no defined fragment shader output for its location.</li>
+        </ul>
     </p>
 
     <p>
-        If any draw buffer with an attachment does not have a defined fragment shader output, draws
-        generate <code>INVALID_OPERATION</code>, unless all 4 channels of <code>colorMask</code> are set to false.
+        If any draw buffers are "shader-output-incompatible", draws generate <code>INVALID_OPERATION</code> if:
+        <ul>
+          <li>Any channel of <code>colorMask</code> is set to true</li>
+          <li>AND, for each <code>DRAW_BUFFERi</code> of <code>DRAW_FRAMEBUFFER</code> that is "shader-output-incompatible":
+            <ul>
+              <li><code>DRAW_BUFFERi</code> is not <code>NONE</code></li>
+              <li>AND, any channel <code>colorMaski</code> (from e.g. OES_draw_buffers_indexed) is set to true.</li>
+            </ul>
+          </li>
+        </ul>
     </p>
 
     <h3>No Program Binaries</h3>