diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2015-05-26 12:14:39 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-05-28 16:56:31 -0700 |
| commit | 464c56d3d5ca2c9d6e437e756950f0fa2996d8da (patch) | |
| tree | 4380332d778747872dd6f3c05edec33f4abe54ab /src/mesa/drivers/dri/common | |
| parent | 1fe243938b11be740417cf016d8c50cd69228628 (diff) | |
| download | external_mesa3d-464c56d3d5ca2c9d6e437e756950f0fa2996d8da.zip external_mesa3d-464c56d3d5ca2c9d6e437e756950f0fa2996d8da.tar.gz external_mesa3d-464c56d3d5ca2c9d6e437e756950f0fa2996d8da.tar.bz2 | |
dri_util: Use _mesa_override_gl_version_contextless
Remove _mesa_get_gl_version_override. We don't need two functions that
do basically the same thing. This change seemed easier (esp. with the
next patch) than going the other way.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/common')
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index d6e875f..f0e5440 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -162,13 +162,17 @@ driCreateNewScreen2(int scrn, int fd, return NULL; } - int gl_version_override = _mesa_get_gl_version_override(); - if (gl_version_override >= 31) { - psp->max_gl_core_version = MAX2(psp->max_gl_core_version, - gl_version_override); - } else { - psp->max_gl_compat_version = MAX2(psp->max_gl_compat_version, - gl_version_override); + struct gl_constants consts = { 0 }; + gl_api api; + int version; + + api = API_OPENGL_COMPAT; + if (_mesa_override_gl_version_contextless(&consts, &api, &version)) { + if (api == API_OPENGL_CORE) { + psp->max_gl_core_version = version; + } else { + psp->max_gl_compat_version = version; + } } psp->api_mask = (1 << __DRI_API_OPENGL); |