commit 14b2126ecfc333b8cf9ed85d8106983ea1be6ab6
author Martin Radev <mradev@nvidia.com> Fri Aug 25 13:54:37 2017 +0300
committer Commit Bot <commit-bot@chromium.org> Tue Aug 29 14:16:41 2017 +0000
tree ffda937123481200bcfdc67027a87ec363205613
parent 39e781220cbe2be9b6c6251ca1f645cfe8207ea2

Relax multi-view end-point validation on detach

Passing invalid arguments to the multi-view end-points should not
generate an error if a texture is being detached from the framebuffer.

BUG=angleproject:2062
TEST=angle_end2end_tests

Change-Id: I22e1ed13b64db046724031d0189612d5e111dcac
Reviewed-on: https://chromium-review.googlesource.com/635166
Commit-Queue: Martin Radev <mradev@nvidia.com>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/validationES3.cpp

diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
index 4f52b0f..de011ec 100644
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -45,7 +45,7 @@
         return false;
     }
 
-    if (numViews < 1)
+    if (texture != 0 && numViews < 1)
     {
         context->handleError(InvalidValue() << "numViews cannot be less than 1.");
         return false;
@@ -2727,14 +2727,14 @@
         return false;
     }
 
-    if (baseViewIndex < 0)
-    {
-        context->handleError(InvalidValue() << "baseViewIndex cannot be less than 0.");
-        return false;
-    }
-
     if (texture != 0)
     {
+        if (baseViewIndex < 0)
+        {
+            context->handleError(InvalidValue() << "baseViewIndex cannot be less than 0.");
+            return false;
+        }
+
         Texture *tex = context->getTexture(texture);
         ASSERT(tex);
 
@@ -2781,19 +2781,19 @@
         return false;
     }
 
-    const GLsizei numViewportOffsetValues = numViews * 2;
-    for (GLsizei i = 0; i < numViewportOffsetValues; ++i)
-    {
-        if (viewportOffsets[i] < 0)
-        {
-            context->handleError(InvalidValue()
-                                 << "viewportOffsets cannot contain negative values.");
-            return false;
-        }
-    }
-
     if (texture != 0)
     {
+        const GLsizei numViewportOffsetValues = numViews * 2;
+        for (GLsizei i = 0; i < numViewportOffsetValues; ++i)
+        {
+            if (viewportOffsets[i] < 0)
+            {
+                context->handleError(InvalidValue()
+                                     << "viewportOffsets cannot contain negative values.");
+                return false;
+            }
+        }
+
         Texture *tex = context->getTexture(texture);
         ASSERT(tex);