Title: [264562] trunk/Source/ThirdParty/ANGLE
Revision
264562
Author
[email protected]
Date
2020-07-17 18:38:01 -0700 (Fri, 17 Jul 2020)

Log Message

[WebGL2] Fix validation of pixel unpack parameters
https://bugs.webkit.org/show_bug.cgi?id=214509

Patch by Kenneth Russell <[email protected]> on 2020-07-17
Reviewed by Dean Jackson.

Fix small error discovered while upstreaming the previous fix to
the ANGLE project.

* src/libANGLE/validationES3.cpp:
(gl::ValidateES3TexImageParametersBase):

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (264561 => 264562)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2020-07-18 00:37:18 UTC (rev 264561)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2020-07-18 01:38:01 UTC (rev 264562)
@@ -1,5 +1,18 @@
 2020-07-17  Kenneth Russell  <[email protected]>
 
+        [WebGL2] Fix validation of pixel unpack parameters
+        https://bugs.webkit.org/show_bug.cgi?id=214509
+
+        Reviewed by Dean Jackson.
+
+        Fix small error discovered while upstreaming the previous fix to
+        the ANGLE project.
+
+        * src/libANGLE/validationES3.cpp:
+        (gl::ValidateES3TexImageParametersBase):
+
+2020-07-17  Kenneth Russell  <[email protected]>
+
         [WebGL2] ReadPixels updates
         https://bugs.webkit.org/show_bug.cgi?id=209516
 

Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp (264561 => 264562)


--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp	2020-07-18 00:37:18 UTC (rev 264561)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/validationES3.cpp	2020-07-18 01:38:01 UTC (rev 264562)
@@ -688,11 +688,9 @@
         //      GL_UNPACK_SKIP_ROWS + height > DataStoreHeight
         //    except for texImage3D if no GL_PIXEL_UNPACK_BUFFER is
         //    bound and _pixels_ is null.
-        if (!pixelUnpackBuffer && !pixels)
+        if (!pixelUnpackBuffer && !pixels && !isSubImage)
         {
             // Exception case for texImage2D or texImage3D, above.
-            // The validation above ensures null pixels have been rejected for texSubImage.
-            ASSERT(!isSubImage);
         }
         else
         {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to