Mesa (master): intel: update max versions based on MESA_GL_VERSION_OVERRIDE
Jordan Justen
jljusten at kemper.freedesktop.org
Fri Mar 1 05:55:51 UTC 2013
Module: Mesa
Branch: master
Commit: fde59a27fb981e9d05773891a453b2b142f85871
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fde59a27fb981e9d05773891a453b2b142f85871
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Thu Feb 21 16:59:33 2013 -0800
intel: update max versions based on MESA_GL_VERSION_OVERRIDE
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 <jordan.l.justen at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/intel/intel_screen.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 277b133..78768e5 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
More information about the mesa-commit
mailing list