diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2015-04-29 16:12:40 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-05-28 16:56:31 -0700 |
| commit | 9b5e92f4ccc6ee1cb9caea947f6efaad2b391cf1 (patch) | |
| tree | b7b85f81804677cbc541eb54ab3683e4380660dd | |
| parent | 03fd6704db9f1d0f203bf8da18bd587c7e35ce60 (diff) | |
mesa: Allow overriding the version of ES2+ contexts
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index f0e5440c225..2d847ef7bc8 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -166,6 +166,10 @@ driCreateNewScreen2(int scrn, int fd, gl_api api; int version; + api = API_OPENGLES2; + if (_mesa_override_gl_version_contextless(&consts, &api, &version)) + psp->max_gl_es2_version = version; + api = API_OPENGL_COMPAT; if (_mesa_override_gl_version_contextless(&consts, &api, &version)) { if (api == API_OPENGL_CORE) { diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index e4faf3d462a..8a59b5ed42f 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1169,9 +1169,7 @@ _mesa_initialize_context(struct gl_context *ctx, ctx->HasConfig = GL_FALSE; } - if (_mesa_is_desktop_gl(ctx)) { - _mesa_override_gl_version(ctx); - } + _mesa_override_gl_version(ctx); /* misc one-time initializations */ one_time_init(ctx); diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 0376954f742..a2dee6298fa 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -924,8 +924,7 @@ static unsigned get_version(struct pipe_screen *screen, struct gl_extensions extensions = {0}; GLuint version; - if ((api == API_OPENGL_COMPAT || api == API_OPENGL_CORE) && - _mesa_override_gl_version_contextless(&consts, &api, &version)) { + if (_mesa_override_gl_version_contextless(&consts, &api, &version)) { return version; } |