Mesa (master): i965: Always set MaxViewports and related limits

[Kenneth Graunke]

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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Nov  8 10:10:34 2016 -0800

i965: Always set MaxViewports and related limits

Since 9d6ca7c3, there should be no performance hit for having
MaxViewports > 1.  Always set this context state.  This eliminates the
need to update this conditional as we add support for OES_viewport_array
on older GPUs.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_context.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 0b9d2a0..f939463 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -795,8 +795,7 @@ brw_initialize_context_constants(struct brw_context *brw)
    }
 
    /* ARB_viewport_array, OES_viewport_array */
-   if ((brw->gen >= 6 && ctx->API == API_OPENGL_CORE) ||
-       (brw->gen >= 8  && ctx->API == API_OPENGLES2)) {
+   if (brw->gen >= 6) {
       ctx->Const.MaxViewports = GEN6_NUM_VIEWPORTS;
       ctx->Const.ViewportSubpixelBits = 0;