From ba8a347f932f966422a5e156e54e8d05b664cf44 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 6 Nov 2017 15:20:35 +0000 Subject: mesa: split extensions overrides and glGetString(GL_EXTENSIONS) Currently we apply the extension overrides and construct the extensions string upon MakeCurrent. They are two distinct things, so let's slit the two while pushing the overrides management _before_ _mesa_compute_version(). This ensures that the version is updated to reflect the enabled/disabled extensions. Cc: Jordan Justen Signed-off-by: Emil Velikov Reviewed-by: Brian Paul --- src/mesa/drivers/dri/i915/i830_context.c | 1 + src/mesa/drivers/dri/i915/i915_context.c | 1 + 2 files changed, 2 insertions(+) (limited to 'src/mesa/drivers/dri/i915') diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index 299e54d50eb..4aa96cad0f8 100644 --- a/src/mesa/drivers/dri/i915/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c @@ -124,6 +124,7 @@ i830CreateContext(int api, _tnl_allow_vertex_fog(ctx, 1); _tnl_allow_pixel_fog(ctx, 0); + _mesa_override_extensions(ctx); _mesa_compute_version(ctx); _mesa_initialize_dispatch_tables(ctx); diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 4f6bdb74e7c..e40e358281a 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -289,6 +289,7 @@ i915CreateContext(int api, _tnl_allow_vertex_fog(ctx, 0); _tnl_allow_pixel_fog(ctx, 1); + _mesa_override_extensions(ctx); _mesa_compute_version(ctx); _mesa_initialize_dispatch_tables(ctx); -- cgit v1.2.3