<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[278362] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/278362">278362</a></dd>
<dt>Author</dt> <dd>kpiddington@apple.com</dd>
<dt>Date</dt> <dd>2021-06-02 10:01:48 -0700 (Wed, 02 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add 'mix' override with bool-vectors to MSL translator
https://bugs.webkit.org/show_bug.cgi?id=226366

Source/ThirdParty/ANGLE:

Reviewed by Dean Jackson.

Add in 'mix' overrides, and logic for selecting mix with bool when necessary.

* src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp:
(GetOperatorString):
(GenMetalTraverser::visitAggregate):
* src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp:

LayoutTests:

Add a short test to ensure bool-vectors can be used in mix.
Reviewed by Dean Jackson.

* fast/canvas/webgl/shader-mix-with-bool-expected.txt: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrccompilertranslatorTranslatorMetalDirectEmitMetalcpp">trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrccompilertranslatorTranslatorMetalDirectProgramPreludecpp">trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebglshadermixwithboolexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglshadermixwithboolhtml">trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278361 => 278362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-06-02 16:59:37 UTC (rev 278361)
+++ trunk/LayoutTests/ChangeLog 2021-06-02 17:01:48 UTC (rev 278362)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-06-02  Kyle Piddington  <kpiddington@apple.com>
+
+        Add 'mix' override with bool-vectors to MSL translator
+        https://bugs.webkit.org/show_bug.cgi?id=226366
+
+        Add a short test to ensure bool-vectors can be used in mix.  
+        Reviewed by Dean Jackson.
+
+        * fast/canvas/webgl/shader-mix-with-bool-expected.txt: Added.
+
</ins><span class="cx"> 2021-06-02  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         HTMLMediaElement::virtualHasPendingActivity may keep objects alive unnecessarily
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglshadermixwithboolexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool-expected.txt (0 => 278362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool-expected.txt                            (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool-expected.txt       2021-06-02 17:01:48 UTC (rev 278362)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that program compiling/linking with a bool mix function works correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+PASS getError was expected value: NO_ERROR : no error from using mix function
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglshadermixwithboolhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool.html (0 => 278362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool.html                            (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/shader-mix-with-bool.html       2021-06-02 17:01:48 UTC (rev 278362)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+       <script src="../../../resources/js-test.js" type="text/javascript"></script>
+       <script src="resources/webgl-test.js" type="text/javascript"></script>
+    <script src="resources/webgl-test-utils.js"> </script>
+    <script>
+    var wtu = WebGLTestUtils;
+    function runTest()
+    {
+       description("Tests that program compiling/linking with a bool mix function works correctly.");
+        var canvas = document.getElementById('webgl-canvas');
+        var gl = canvas.getContext("webgl2");
+        var fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
+        var program = gl.createProgram();
+        var vertexShader = gl.createShader(gl.VERTEX_SHADER);
+        gl.shaderSource(vertexShader, '#version 300 es\n in vec2 pos;\nvoid main() { bvec2 mixVec = bvec2(true, false); gl_Position = vec4(mix(pos, vec2(1,1), mixVec), 0, 1); }');
+        gl.compileShader(vertexShader);
+        gl.shaderSource(fragmentShader, '#version 300 es\n precision mediump float; out vec4 color; void main() { color = vec4(0,0.8,0,1); }');
+        gl.compileShader(fragmentShader);
+        gl.attachShader(program, vertexShader);
+        gl.attachShader(program, fragmentShader);
+        gl.linkProgram(program);
+        gl.useProgram(program);
+        gl.drawArrays(gl.TRIANGLES, 0, 3);
+               wtu.glErrorShouldBe(gl,0,"no error from using mix function");
+
+        if (window.testRunner)
+          testRunner.notifyDone();
+    }
+
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
+    }
+
+    window.onpageshow = runTest;
+    </script>
+</head>
+<body>
+    <canvas id="webgl-canvas" width="100px" height="100px"></canvas>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (278361 => 278362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog  2021-06-02 16:59:37 UTC (rev 278361)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog     2021-06-02 17:01:48 UTC (rev 278362)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-06-02  Kyle Piddington  <kpiddington@apple.com>
+
+        Add 'mix' override with bool-vectors to MSL translator
+        https://bugs.webkit.org/show_bug.cgi?id=226366
+
+        Reviewed by Dean Jackson.
+
+        Add in 'mix' overrides, and logic for selecting mix with bool when necessary.
+
+        * src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp:
+        (GetOperatorString):
+        (GenMetalTraverser::visitAggregate):
+        * src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp:
+
</ins><span class="cx"> 2021-06-01  Kyle Piddington  <kpiddington@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Metal ANGLE] transformFeedback samples on webglsamples.org do not render correctly
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccompilertranslatorTranslatorMetalDirectEmitMetalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp (278361 => 278362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp        2021-06-02 16:59:37 UTC (rev 278361)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp   2021-06-02 17:01:48 UTC (rev 278362)
</span><span class="lines">@@ -258,7 +258,8 @@
</span><span class="cx"> static const char *GetOperatorString(TOperator op,
</span><span class="cx">                                      const TType &resultType,
</span><span class="cx">                                      const TType *argType0,
</span><del>-                                     const TType *argType1 = nullptr)
</del><ins>+                                     const TType *argType1 = nullptr,
+                                     const TType *argType2 = nullptr)
</ins><span class="cx"> {
</span><span class="cx">     switch (op)
</span><span class="cx">     {
</span><span class="lines">@@ -513,6 +514,8 @@
</span><span class="cx">         case TOperator::EOpClamp:
</span><span class="cx">             return "metal::clamp";  // TODO fast vs precise namespace
</span><span class="cx">         case TOperator::EOpMix:
</span><ins>+            if(argType2 && argType2->getBasicType() == EbtBool)
+                return "ANGLE_mix_bool";
</ins><span class="cx">             return "metal::mix";
</span><span class="cx">         case TOperator::EOpStep:
</span><span class="cx">             return "metal::step";
</span><span class="lines">@@ -2166,9 +2169,10 @@
</span><span class="cx">                 ASSERT(!args.empty());
</span><span class="cx">                 const TType *argType0 = getArgType(0);
</span><span class="cx">                 const TType *argType1 = getArgType(1);
</span><ins>+                const TType *argType2 = getArgType(2);
</ins><span class="cx">                 ASSERT(argType0);
</span><span class="cx"> 
</span><del>-                const char *opName = GetOperatorString(op, retType, argType0, argType1);
</del><ins>+                const char *opName = GetOperatorString(op, retType, argType0, argType1, argType2);
</ins><span class="cx"> 
</span><span class="cx">                 if (IsSymbolicOperator(op, retType, argType0, argType1))
</span><span class="cx">                 {
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccompilertranslatorTranslatorMetalDirectProgramPreludecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp (278361 => 278362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp   2021-06-02 16:59:37 UTC (rev 278361)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp      2021-06-02 17:01:48 UTC (rev 278362)
</span><span class="lines">@@ -82,7 +82,8 @@
</span><span class="cx">     void visitOperator(TOperator op,
</span><span class="cx">                        const TFunction *func,
</span><span class="cx">                        const TType *argType0,
</span><del>-                       const TType *argType1 = nullptr);
</del><ins>+                       const TType *argType1 = nullptr,
+                       const TType *argType2 = nullptr);
</ins><span class="cx">     void visitVariable(const Name &name, const TType &type);
</span><span class="cx">     void visitVariable(const TVariable &var);
</span><span class="cx">     void visitStructure(const TStructure &s);
</span><span class="lines">@@ -123,6 +124,7 @@
</span><span class="cx">     void degrees();
</span><span class="cx">     void radians();
</span><span class="cx">     void mod();
</span><ins>+    void mixBool();
</ins><span class="cx">     void postIncrementMatrix();
</span><span class="cx">     void preIncrementMatrix();
</span><span class="cx">     void postDecrementMatrix();
</span><span class="lines">@@ -724,6 +726,18 @@
</span><span class="cx"> )",
</span><span class="cx">                         include_metal_math())
</span><span class="cx"> 
</span><ins>+PROGRAM_PRELUDE_DECLARE(mixBool,
+                        R"(
+                        
+template <typename T, int N>
+ANGLE_ALWAYS_INLINE metal::vec<T,N> ANGLE_mix_bool(metal::vec<T, N> a, metal::vec<T, N> b, metal::vec<bool, N> c)
+{
+    return metal::mix(a, b, static_cast<metal::vec<T,N>>(c));
+}
+)",
+                        include_metal_common())
+
+
</ins><span class="cx"> PROGRAM_PRELUDE_DECLARE(pack_half_2x16,
</span><span class="cx">                         R"(
</span><span class="cx"> ANGLE_ALWAYS_INLINE uint ANGLE_pack_half_2x16(float2 v)
</span><span class="lines">@@ -3385,7 +3399,8 @@
</span><span class="cx"> void ProgramPrelude::visitOperator(TOperator op,
</span><span class="cx">                                    const TFunction *func,
</span><span class="cx">                                    const TType *argType0,
</span><del>-                                   const TType *argType1)
</del><ins>+                                   const TType *argType1,
+                                   const TType *argType2)
</ins><span class="cx"> {
</span><span class="cx">     switch (op)
</span><span class="cx">     {
</span><span class="lines">@@ -3510,11 +3525,17 @@
</span><span class="cx">         case TOperator::EOpClamp:
</span><span class="cx">         case TOperator::EOpMin:
</span><span class="cx">         case TOperator::EOpMax:
</span><del>-        case TOperator::EOpMix:
</del><span class="cx">         case TOperator::EOpStep:
</span><span class="cx">         case TOperator::EOpSmoothstep:
</span><span class="cx">             include_metal_common();
</span><span class="cx">             break;
</span><ins>+        case TOperator::EOpMix:
+            include_metal_common();
+            if(argType2->getBasicType() == TBasicType::EbtBool)
+            {
+                mixBool();
+            }
+            break;
</ins><span class="cx"> 
</span><span class="cx">         case TOperator::EOpAll:
</span><span class="cx">         case TOperator::EOpAny:
</span><span class="lines">@@ -3886,6 +3907,15 @@
</span><span class="cx">             visitOperator(node->getOp(), func, &argType0, &argType1);
</span><span class="cx">         }
</span><span class="cx">         break;
</span><ins>+            
+        case 3:
+        {
+            const TType &argType0 = getArgType(0);
+            const TType &argType1 = getArgType(1);
+            const TType &argType2 = getArgType(2);
+            visitOperator(node->getOp(), func, &argType0, &argType1, &argType2);
+        }
+        break;
</ins><span class="cx"> 
</span><span class="cx">         default:
</span><span class="cx">         {
</span></span></pre>
</div>
</div>

</body>
</html>