Add ES 3.1 check to ValidateBindImageTexture

This fixes a crash that occured in the Lego trace when run with an ES 3.0 context. * At the end of each frame it unbinds all the image units using glBindImageTexture, which is an ES 3.1 call. * During validation, we verify things using ANGLE's internals, but they are only set up when the context is >= ES 3.1. * This led to a crash. * The fix is to check the ES context early and bail, which aligns with other entry points. Test: LEGO MEC Bug: b/161716126 Bug: angleproject:4048 Change-Id: I9aee2ee173436f5de5062758a70e0909f6fc9a7f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2462163Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Charlie Lao <cclao@google.com> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>

Add ES 3.1 check to ValidateBindImageTexture
8f57f60f · Cody Northrop · Commit Bot · babce049 · 8f57f60f · 8f57f60f
Commit 8f57f60f authored Oct 08, 2020 by Cody Northrop Committed by Commit Bot Oct 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

State.cpp src/libANGLE/State.cpp +2 -0

validationES31.cpp src/libANGLE/validationES31.cpp +6 -0

No files found.
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -3390,6 +3390,8 @@ void State::setImageUnit(const Context *context,
                         GLenum access,
                         GLenum format)
 {
+    ASSERT(!mImageUnits.empty());
    ImageUnit &imageUnit = mImageUnits[unit];
    if (texture)

--- a/src/libANGLE/validationES31.cpp
+++ b/src/libANGLE/validationES31.cpp
@@ -1448,6 +1448,12 @@ bool ValidateBindImageTexture(const Context *context,
                              GLenum access,
                              GLenum format)
 {
+    if (context->getClientVersion() < ES_3_1)
+    {
+        context->validationError(GL_INVALID_OPERATION, kES31Required);
+        return false;
+    }
    GLuint maxImageUnits = static_cast<GLuint>(context->getCaps().maxImageUnits);
    if (unit >= maxImageUnits)
    {