X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fviewport.c;h=bd580446f7620d174530493e211721c739f2d616;hb=e70d0d22a2dccc1df2c88890a2964491cdafac94;hp=f59723fad9571594c4f6551a7e02a16459ada0a3;hpb=0f01aa803332760079bde36218a3e884f2613db6;p=mesa.git

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,