fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dri_util: Use _mesa_override_gl_version_contextless

Browse source 
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>
This commit is contained in:
Ian Romanick 2015-05-26 12:14:39 -07:00
parent 1fe243938b
commit 464c56d3d5
3 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/drivers/dri/common/dri_util.c
View file

@ -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);

16
src/mesa/main/version.c
View file

@ -156,22 +156,6 @@ _mesa_override_gl_version(struct gl_context *ctx)
}
}
/**
* Returns the gl override value
*
* version > 0 indicates there is an override requested
*/
int
_mesa_get_gl_version_override(void)
{
int version;
bool fwd_context, compat_context;
get_gl_override(&version, &fwd_context, &compat_context);
return version;
}
/**
* Override the context's GLSL version if the environment variable
* MESA_GLSL_VERSION_OVERRIDE is set. Valid values for

3
src/mesa/main/version.h
View file

@ -47,7 +47,4 @@ _mesa_override_gl_version(struct gl_context *ctx);
extern void
_mesa_override_glsl_version(struct gl_constants *consts);
extern int
_mesa_get_gl_version_override(void);
#endif /* VERSION_H */