diff options
author | Ian Romanick <[email protected]> | 2013-06-27 18:20:17 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2013-06-28 13:35:21 -0700 |
commit | 0b9398c74f0189b7d7904749e24934e08a0a4cfb (patch) | |
tree | 25bdb50875dd2fc93bbf24db7f142c8b7a8d0261 /src/mesa | |
parent | ae66a656fd3e205d81284f45bbc0422c7e198da6 (diff) |
i965: Merge the two GEN >= 6 extension enable blocks
There's no reason for these blocks to be separate.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_extensions.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index f9f4ad94fa5..d70655b3099 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -139,6 +139,8 @@ intelInitExtensions(struct gl_context *ctx) _mesa_override_glsl_version(ctx); if (intel->gen >= 6) { + uint64_t dummy; + ctx->Extensions.EXT_framebuffer_multisample = true; ctx->Extensions.EXT_transform_feedback = true; ctx->Extensions.ARB_blend_func_extended = !driQueryOptionb(&intel->optionCache, "disable_blend_func_extended"); @@ -152,6 +154,10 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.ARB_shading_language_packing = true; ctx->Extensions.ARB_texture_multisample = true; ctx->Extensions.ARB_texture_storage_multisample = true; + + /* Test if the kernel has the ioctl. */ + if (drm_intel_reg_read(intel->bufmgr, TIMESTAMP, &dummy) == 0) + ctx->Extensions.ARB_timer_query = true; } if (intel->gen >= 5) { @@ -159,13 +165,6 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.EXT_timer_query = true; } - if (intel->gen >= 6) { - uint64_t dummy; - /* Test if the kernel has the ioctl. */ - if (drm_intel_reg_read(intel->bufmgr, TIMESTAMP, &dummy) == 0) - ctx->Extensions.ARB_timer_query = true; - } - if (ctx->API == API_OPENGL_CORE) ctx->Extensions.ARB_base_instance = true; if (ctx->API != API_OPENGL_CORE) |