Changeset 281547 in webkit

Timestamp:

Aug 24, 2021, 11:04:26 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

ANGLE Metal infinities and NaNs generated with incorrect syntax
​https://bugs.webkit.org/show_bug.cgi?id=229439
<rdar://81033366>

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-08-24
Reviewed by Dean Jackson.

Source/ThirdParty/ANGLE:

Generate NaN and infinity constant values correctly.
An else was missing from if-block, causing double processing.

• src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp:

(GenMetalTraverser::emitSingleConstant):

• src/libANGLE/renderer/metal/mtl_utils.mm:

(rx::mtl::CreateShaderLibrary):

LayoutTests:

Add tests that test some aspects of NaN and -+inf that the GLSL ES 3.00 spec
talks about.

• webgl/pending/conformance2/glsl3/float-constant-expressions-expected.txt: Added.
• webgl/pending/conformance2/glsl3/float-constant-expressions.html: Added.
• webgl/pending/resources/webgl_test_files/conformance2/glsl3/float-constant-expressions.html: Added.
• webgl/pending/resources/webgl_test_files/js/glsl-conformance-test.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgl/pending/conformance2 (added)
• LayoutTests/webgl/pending/conformance2/glsl3 (added)
• LayoutTests/webgl/pending/conformance2/glsl3/float-constant-expressions-expected.txt (added)
• LayoutTests/webgl/pending/conformance2/glsl3/float-constant-expressions.html (added)
• LayoutTests/webgl/pending/resources/webgl_test_files/conformance2 (added)
• LayoutTests/webgl/pending/resources/webgl_test_files/conformance2/glsl3 (added)
• LayoutTests/webgl/pending/resources/webgl_test_files/conformance2/glsl3/float-constant-expressions.html (added)
• LayoutTests/webgl/pending/resources/webgl_test_files/js/glsl-conformance-test.js (added)
• Source/ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-08-24  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        ANGLE Metal infinities and NaNs generated with incorrect syntax
+        https://bugs.webkit.org/show_bug.cgi?id=229439
+        <rdar://81033366>
+
+        Reviewed by Dean Jackson.
+
+        Add tests that test some aspects of NaN and -+inf that the GLSL ES 3.00 spec
+        talks about.
+
+        * webgl/pending/conformance2/glsl3/float-constant-expressions-expected.txt: Added.
+        * webgl/pending/conformance2/glsl3/float-constant-expressions.html: Added.
+        * webgl/pending/resources/webgl_test_files/conformance2/glsl3/float-constant-expressions.html: Added.
+        * webgl/pending/resources/webgl_test_files/js/glsl-conformance-test.js: Added.
+
 2021-08-24  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-08-24  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        ANGLE Metal infinities and NaNs generated with incorrect syntax
+        https://bugs.webkit.org/show_bug.cgi?id=229439
+        <rdar://81033366>
+
+        Reviewed by Dean Jackson.
+
+        Generate NaN and infinity constant values correctly.
+        An else was missing from if-block, causing double processing.
+
+        * src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp:
+        (GenMetalTraverser::emitSingleConstant):
+        * src/libANGLE/renderer/metal/mtl_utils.mm:
+        (rx::mtl::CreateShaderLibrary):
+
 2021-08-17  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp

@@ -1502 +1502 @@
                 mOut << "NAN";
             }
-            if (ANGLE_UNLIKELY(isinf(constUnion->getFConst())))
+            else if (ANGLE_UNLIKELY(isinf(constUnion->getFConst())))
             {
                 if(constUnion->getFConst() < 0)