diff options
| author | Marek Olšák <[email protected]> | 2017-06-10 01:07:59 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-06-22 01:51:02 +0200 |
| commit | b677e96078889140ad1549cb7b94b0a33c10f7ba (patch) | |
| tree | e11326c728215c9609b80f2bdde5d4d15a27c4bb /src/mesa/main | |
| parent | 37b834923d31bb170ffbfac882476659060b78b2 (diff) | |
mesa: use DriverFlags.NewAlphaTest to communicate alphatest changes to st/mesa
Now AlphaFunc avoids the blend state update in st/mesa and avoids
_mesa_update_state_locked.
The GL_ALPHA_TEST enable won't trigger blend state updates in st/mesa
after st/mesa stops relying on _NEW_COLOR.
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/blend.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/enable.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 8c763ed34e5..e042b5e8e6a 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -735,7 +735,8 @@ _mesa_AlphaFunc( GLenum func, GLclampf ref ) case GL_NOTEQUAL: case GL_GEQUAL: case GL_ALWAYS: - FLUSH_VERTICES(ctx, _NEW_COLOR); + FLUSH_VERTICES(ctx, ctx->DriverFlags.NewAlphaTest ? 0 : _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewAlphaTest; ctx->Color.AlphaFunc = func; ctx->Color.AlphaRefUnclamped = ref; ctx->Color.AlphaRef = CLAMP(ref, 0.0F, 1.0F); diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 5a37770d009..9dccf759ca1 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -293,7 +293,9 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) goto invalid_enum_error; if (ctx->Color.AlphaEnabled == state) return; + /* AlphaEnabled is used by the fixed-func fragment program */ FLUSH_VERTICES(ctx, _NEW_COLOR); + ctx->NewDriverState |= ctx->DriverFlags.NewAlphaTest; ctx->Color.AlphaEnabled = state; break; case GL_AUTO_NORMAL: diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index e78554bd0b0..4e870359dc8 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4475,6 +4475,9 @@ struct gl_driver_flags /** gl_context::Scissor::ScissorArray */ uint64_t NewScissorRect; + /** gl_context::Color::Alpha* */ + uint64_t NewAlphaTest; + /** gl_context::Depth */ uint64_t NewDepth; |