Mesa (master): mesa: Add a check for OES_viewport_array

[Anuj Phogat]

Module: Mesa
Branch: master
Commit: 239ff641739dc9d6ce210ad3abb37b7e01171375
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=239ff641739dc9d6ce210ad3abb37b7e01171375

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Wed Sep 28 11:40:37 2016 -0700

mesa: Add a check for OES_viewport_array

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/mesa/main/viewport.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index f59723f..bd58044 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -52,7 +52,9 @@ set_viewport_no_notify(struct gl_context *ctx, unsigned idx,
     *     determined by calling GetFloatv with the symbolic constant
     *     VIEWPORT_BOUNDS_RANGE (see section 6.1)."
     */
-   if (ctx->Extensions.ARB_viewport_array) {
+   if (ctx->Extensions.ARB_viewport_array ||
+       (ctx->Extensions.OES_viewport_array &&
+        _mesa_is_gles31(ctx))) {
       x = CLAMP(x,
                 ctx->Const.ViewportBounds.Min, ctx->Const.ViewportBounds.Max);
       y = CLAMP(y,