KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Add support for a new override string MESA_GLES_VERSION_OVERRIDE 

The string is only applied when the context is API_OPENGLES2.

The bulk of the change is to prevent overriding the context to
API_OPENGL_CORE based on the requested version.  If the context is
API_OPENGL_ES2, don't change it.

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:07:13 -07:00
parent 464c56d3d5
commit 03fd6704db
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mesa/main/version.c
View File

@ -51,15 +51,20 @@ check_for_ending(const char *string, const char *ending)
* fwd_context is only valid if version > 0 * fwd_context is only valid if version > 0
*/ */
static void static void
get_gl_override(int *version, bool *fwd_context, bool *compat_context) get_gl_override(gl_api api, int *version, bool *fwd_context,
bool *compat_context)
{ {
const char *env_var = "MESA_GL_VERSION_OVERRIDE"; const char *env_var = (api == API_OPENGL_CORE || api == API_OPENGL_COMPAT)
? "MESA_GL_VERSION_OVERRIDE" : "MESA_GLES_VERSION_OVERRIDE";
const char *version_str; const char *version_str;
int major, minor, n; int major, minor, n;
static int override_version = -1; static int override_version = -1;
static bool fc_suffix = false; static bool fc_suffix = false;
static bool compat_suffix = false; static bool compat_suffix = false;
if (api == API_OPENGLES)
return;
if (override_version < 0) { if (override_version < 0) {
override_version = 0; override_version = 0;
@ -75,7 +80,12 @@ get_gl_override(int *version, bool *fwd_context, bool *compat_context)
override_version = 0; override_version = 0;
} else { } else {
override_version = major * 10 + minor; override_version = major * 10 + minor;
if (override_version < 30 && fc_suffix) {
/* There is no such thing as compatibility or forward-compatible for
* OpenGL ES 2.0 or 3.x APIs.
*/
if ((override_version < 30 && fc_suffix) ||
(api == API_OPENGLES2 && (fc_suffix || compat_suffix))) {
fprintf(stderr, "error: invalid value for %s: %s\n", fprintf(stderr, "error: invalid value for %s: %s\n",
env_var, version_str); env_var, version_str);
} }
@ -130,18 +140,26 @@ _mesa_override_gl_version_contextless(struct gl_constants *consts,
int version; int version;
bool fwd_context, compat_context; bool fwd_context, compat_context;
get_gl_override(&version, &fwd_context, &compat_context); get_gl_override(*apiOut, &version, &fwd_context, &compat_context);
if (version > 0) { if (version > 0) {
*versionOut = version; *versionOut = version;
if (version >= 30 && fwd_context) {
*apiOut = API_OPENGL_CORE; /* If the API is a desktop API, adjust the context flags. We may also
consts->ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT; * need to modify the API depending on the version. For example, Mesa
} else if (version >= 31 && !compat_context) { * does not support a GL 3.3 compatibility profile.
*apiOut = API_OPENGL_CORE; */
} else { if (*apiOut == API_OPENGL_CORE || *apiOut == API_OPENGL_COMPAT) {
*apiOut = API_OPENGL_COMPAT; if (version >= 30 && fwd_context) {
*apiOut = API_OPENGL_CORE;
consts->ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT;
} else if (version >= 31 && !compat_context) {
*apiOut = API_OPENGL_CORE;
} else {
*apiOut = API_OPENGL_COMPAT;
}
} }
return true; return true;
} }
return false; return false;