diff options
| author | Kenneth Graunke <[email protected]> | 2014-02-26 22:19:33 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-02-27 10:07:40 -0800 |
| commit | cf719a0204effd787fab6f285d72af9c1c144544 (patch) | |
| tree | 803da9606ac23840af49eef8a9a75e747e0f0cba | |
| parent | 612a1d5be1e8e21bceb28ebd77c3b25b72576394 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index d415e610f9a..19600e66c1d 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -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; } |