diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-03 09:16:19 +0100 |
| commit | 17464545a9abdd19312065a578d1f69a6b0b015f (patch) | |
| tree | d39fde94a445ddde95399d4850ffbbbd357a3a19 /mesalib/src/mesa/state_tracker/st_manager.c | |
| parent | eba14241fe23d0561687a1e530a57fa0bfc6ab69 (diff) | |
| parent | b8da71ffb17d3d16706db04115e9ba1dd8bc49b9 (diff) | |
| download | vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.gz vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.bz2 vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_manager.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index 5576a0d6c..0b9add95e 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -615,7 +615,7 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi, switch (attribs->profile) { case ST_PROFILE_DEFAULT: - api = API_OPENGL; + api = API_OPENGL_COMPAT; break; case ST_PROFILE_OPENGL_ES1: api = API_OPENGLES; @@ -673,6 +673,8 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi, st->iface.copy = st_context_copy; st->iface.share = st_context_share; st->iface.st_context_private = (void *) smapi; + st->iface.cso_context = st->cso_context; + st->iface.pipe = st->pipe; *error = ST_CONTEXT_SUCCESS; return &st->iface; |