mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 20:28:04 +02:00
meta: Restore API at the end of _mesa_meta_end(), not the start.
In _mesa_meta_begin(), we switch to API_OPENGL_COMPAT, then munge a lot of state (including some that doesn't exist in the actual API - like PolygonStipple in API_OPENGL_CORE). It seems reasonable that in _mesa_meta_end(), we should restore it, then switch back to the original API. This at least makes it symmetric. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
612a1d5be1
commit
cf719a0204
1 changed files with 2 additions and 2 deletions
|
|
@ -768,8 +768,6 @@ _mesa_meta_end(struct gl_context *ctx)
|
|||
const GLbitfield state = save->SavedState;
|
||||
int i;
|
||||
|
||||
ctx->API = save->API;
|
||||
|
||||
/* After starting a new occlusion query, initialize the results to the
|
||||
* values saved previously. The driver will then continue to increment
|
||||
* these values.
|
||||
|
|
@ -1117,6 +1115,8 @@ _mesa_meta_end(struct gl_context *ctx)
|
|||
_mesa_ResumeTransformFeedback();
|
||||
|
||||
ctx->Meta->SaveStackDepth--;
|
||||
|
||||
ctx->API = save->API;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue