If the override is version is >= 3.1, then update the max_gl_core_version. Otherwise, update max_gl_compat_version.
Signed-off-by: Jordan Justen <[email protected]> --- src/mesa/drivers/dri/intel/intel_screen.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index d223a0b..6cfff4c 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -1156,6 +1156,8 @@ intel_screen_make_configs(__DRIscreen *dri_screen) static void set_max_gl_versions(struct intel_screen *screen) { + int gl_version_override = _mesa_get_gl_version_override(); + switch (screen->gen) { case 7: if (screen->kernel_has_gen7_sol_reset) { @@ -1215,6 +1217,14 @@ set_max_gl_versions(struct intel_screen *screen) break; } + if (gl_version_override >= 31) { + screen->max_gl_core_version = MAX2(screen->max_gl_core_version, + gl_version_override); + } else { + screen->max_gl_compat_version = MAX2(screen->max_gl_compat_version, + gl_version_override); + } + #ifndef FEATURE_ES1 screen->max_gl_es1_version = 0; #endif -- 1.7.10.4 _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
