From 5fc23375e80dd2084f30700bdd3216082f662acc Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 6 May 2015 17:45:11 +1200 Subject: [PATCH] i965/gen6: Enable ARB_viewport_array and AMD_vertex_shader_viewport_index Signed-off-by: Chris Forbes Reviewed-by: Kenneth Graunke --- 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 c28c1716222..3088a1aa2ba 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; }