Mesa (master): i965/gen6: Enable ARB_viewport_array and AMD_vertex_shader_viewport_index

[Chris Forbes]

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

Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Wed May  6 17:45:11 2015 +1200

i965/gen6: Enable ARB_viewport_array and AMD_vertex_shader_viewport_index

Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/intel_extensions.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index c28c171..3088a1a 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -292,6 +292,14 @@ intelInitExtensions(struct gl_context *ctx)
       /* Test if the kernel has the ioctl. */
       if (drm_intel_reg_read(brw->bufmgr, TIMESTAMP, &dummy) == 0)
          ctx->Extensions.ARB_timer_query = true;
+
+      /* Only enable this in core profile because other parts of Mesa behave
+       * slightly differently when the extension is enabled.
+       */
+      if (ctx->API == API_OPENGL_CORE) {
+         ctx->Extensions.ARB_viewport_array = true;
+         ctx->Extensions.AMD_vertex_shader_viewport_index = true;
+      }
    }
 
    if (brw->gen >= 5) {
@@ -313,14 +321,6 @@ intelInitExtensions(struct gl_context *ctx)
          ctx->Extensions.ARB_draw_indirect = true;
       }
 
-      /* Only enable this in core profile because other parts of Mesa behave
-       * slightly differently when the extension is enabled.
-       */
-      if (ctx->API == API_OPENGL_CORE) {
-         ctx->Extensions.ARB_viewport_array = true;
-         ctx->Extensions.AMD_vertex_shader_viewport_index = true;
-      }
-
       ctx->Extensions.ARB_texture_compression_bptc = true;
       ctx->Extensions.ARB_derivative_control = true;
    }