From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Wed, 28 Sep 2016 18:40:37 +0000 (-0700)
Subject: mesa: Add a check for OES_viewport_array
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=239ff641739dc9d6ce210ad3abb37b7e01171375;p=mesa.git

mesa: Add a check for OES_viewport_array

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

diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index f59723fad95..bd580446f76 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,