Validation fix for draw with primcount <= 0

A buffer size validation check was returning an invalid operation error based on buffer size, even when primcount is <= 0 (so the buffer isn't used). Fixes the following WebGL 1.0.4 test with SwANGLE: conformance/extensions/angle-instanced-arrays-out-of-bounds.html Bug: b/154628007 Change-Id: Ibfe4eb57f17cd07100fb8dfbe8069e9ec7515160 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2168546Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Alexis Hétu <sugoi@chromium.org>

Validation fix for draw with primcount <= 0
95741743 · Alexis Hetu · Commit Bot · 5540a307 · 95741743
Commit 95741743 authored Apr 27, 2020 by Alexis Hetu Committed by Commit Bot Apr 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

validationES.h src/libANGLE/validationES.h +3 -1

No files found.
--- a/src/libANGLE/validationES.h
+++ b/src/libANGLE/validationES.h
@@ -983,7 +983,9 @@ ANGLE_INLINE bool ValidateDrawElementsCommon(const Context *context,
            return false;
        }

-        if (elementDataSizeWithOffset > static_cast<uint64_t>(elementArrayBuffer->getSize()))
+        // Related to possible test bug: https://github.com/KhronosGroup/WebGL/issues/3064
+        if ((elementDataSizeWithOffset > static_cast<uint64_t>(elementArrayBuffer->getSize())) &&
+            (primcount > 0))
        {
            context->validationError(GL_INVALID_OPERATION, err::kInsufficientBufferSize);
            return false;