summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Forbes <chrisf@ijw.co.nz>2015-05-06 17:45:11 +1200
committerChris Forbes <chrisf@ijw.co.nz>2015-05-06 19:01:58 +1200
commit5fc23375e80dd2084f30700bdd3216082f662acc (patch)
treea624c786221af17422757a68f2d25707720561a8
parentc41f6252006e9730097b1dab01f6dff1769413de (diff)
i965/gen6: Enable ARB_viewport_array and AMD_vertex_shader_viewport_index
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c16
1 files 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;
}