Title: [291791] trunk
Revision
291791
Author
commit-qu...@webkit.org
Date
2022-03-24 05:44:24 -0700 (Thu, 24 Mar 2022)

Log Message

REGRESSION (r287807): WEBGL_multi_draw validation rejecting valid arguments
https://bugs.webkit.org/show_bug.cgi?id=238239

Patch by Kimmo Kinnunen <kkinnu...@apple.com> on 2022-03-24
Reviewed by Darin Adler.

Source/WebCore:

Fix off-by-one error causing full buffer multidraws to be
marked as invalid.

Enable the newer WebGL conformance tests that test this.

* html/canvas/WebGLMultiDraw.cpp:
(WebCore::WebGLMultiDraw::validateOffset):

LayoutTests:

Enable the newer WebGL conformance tests that test this, marked
Slow as they take a while to run.

* TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (291790 => 291791)


--- trunk/LayoutTests/ChangeLog	2022-03-24 12:18:54 UTC (rev 291790)
+++ trunk/LayoutTests/ChangeLog	2022-03-24 12:44:24 UTC (rev 291791)
@@ -1,3 +1,15 @@
+2022-03-24  Kimmo Kinnunen  <kkinnu...@apple.com>
+
+        REGRESSION (r287807): WEBGL_multi_draw validation rejecting valid arguments
+        https://bugs.webkit.org/show_bug.cgi?id=238239
+
+        Reviewed by Darin Adler.
+
+        Enable the newer WebGL conformance tests that test this, marked
+        Slow as they take a while to run.
+
+        * TestExpectations:
+
 2021-11-02  Sergio Villar Senin  <svil...@igalia.com>
 
         Release assert in Document::updateLayout() via HTMLTextAreaElement::childrenChanged

Modified: trunk/LayoutTests/TestExpectations (291790 => 291791)


--- trunk/LayoutTests/TestExpectations	2022-03-24 12:18:54 UTC (rev 291790)
+++ trunk/LayoutTests/TestExpectations	2022-03-24 12:44:24 UTC (rev 291791)
@@ -3647,6 +3647,7 @@
 webgl/1.0.x/conformance/glsl/bugs/character-set.html [ Pass ]
 webgl/1.0.x/conformance/glsl/misc/fragcolor-fragdata-invariant.html [ Pass ]
 webgl/1.0.x/conformance/context/constants-and-properties.html [ Pass ]
+webgl/1.0.x/conformance/extensions/webgl-multi-draw.html [ Pass Slow ]
 
 
 # WebGL conformance test suite 2.0.1 is skipped until 2.0.0 is retired.
@@ -3657,6 +3658,7 @@
 webgl/2.0.y/conformance/misc/invalid-passed-params.html [ Pass ]
 webgl/2.0.y/conformance/glsl/bugs/character-set.html [ Pass ]
 webgl/2.0.y/conformance/glsl/misc/fragcolor-fragdata-invariant.html [ Pass ]
+webgl/2.0.y/conformance/extensions/webgl-multi-draw.html [ Pass Slow ]
 webgl/2.0.y/conformance2/context/constants-and-properties-2.html [ Pass ]
 webgl/2.0.y/conformance2/vertex_arrays/vertex-array-object.html [ Pass ]
 webgl/1.0.x/conformance/extensions/oes-vertex-array-object.html [ Pass ]

Modified: trunk/Source/WebCore/ChangeLog (291790 => 291791)


--- trunk/Source/WebCore/ChangeLog	2022-03-24 12:18:54 UTC (rev 291790)
+++ trunk/Source/WebCore/ChangeLog	2022-03-24 12:44:24 UTC (rev 291791)
@@ -1,3 +1,18 @@
+2022-03-24  Kimmo Kinnunen  <kkinnu...@apple.com>
+
+        REGRESSION (r287807): WEBGL_multi_draw validation rejecting valid arguments
+        https://bugs.webkit.org/show_bug.cgi?id=238239
+
+        Reviewed by Darin Adler.
+
+        Fix off-by-one error causing full buffer multidraws to be
+        marked as invalid.
+
+        Enable the newer WebGL conformance tests that test this.
+
+        * html/canvas/WebGLMultiDraw.cpp:
+        (WebCore::WebGLMultiDraw::validateOffset):
+
 2022-03-24  Antti Koivisto  <an...@apple.com>
 
         Allow styles with appearance in matched declaration cache

Modified: trunk/Source/WebCore/html/canvas/WebGLMultiDraw.cpp (291790 => 291791)


--- trunk/Source/WebCore/html/canvas/WebGLMultiDraw.cpp	2022-03-24 12:18:54 UTC (rev 291790)
+++ trunk/Source/WebCore/html/canvas/WebGLMultiDraw.cpp	2022-03-24 12:44:24 UTC (rev 291791)
@@ -134,7 +134,7 @@
         return false;
     }
 
-    if (offset >= static_cast<GCGLuint>(size - drawcount)) {
+    if (offset > static_cast<GCGLuint>(size - drawcount)) {
         m_context->synthesizeGLError(GraphicsContextGL::INVALID_OPERATION, functionName, outOfBoundsDescription);
         return false;
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to