Module: Mesa
Branch: master
Commit: 51d36f5e02d7083e52b5617bf44de0105c611db4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=51d36f5e02d7083e52b5617bf44de0105c611db4
Author: Marek Olšák <marek.ol...@amd.com>
Date: Sun Jan 7 18:27:40 2018 +0100
mesa: don't flag _NEW_COLOR for KHR adv.blend if prog constant doesn't change
This only affects drivers that set DriverFlags.NewBlend.
v2: - fix typo advanded -> advanced
- return "enum gl_advanced_blend_mode" from
_mesa_get_advanced_blend_sh_constant
- don't call FLUSH_VERTICES twice
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/mesa/main/blend.c | 6 ++++--
src/mesa/main/blend.h | 43 +++++++++++++++++++++++++++++++--------
src/mesa/main/enable.c | 14 +++++++++----
src/mesa/program/prog_statevars.c | 3 ++-
4 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 6b379f2499..ec8e27e1d4 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -535,7 +535,8 @@ _mesa_BlendEquation( GLenum mode )
return;
}
- _mesa_flush_vertices_for_blend_state(ctx);
+ _mesa_flush_vertices_for_blend_adv(ctx, ctx->Color.BlendEnabled,
+ advanced_mode);
for (buf = 0; buf < numBuffers; buf++) {
ctx->Color.Blend[buf].EquationRGB = mode;
@@ -560,7 +561,8 @@ blend_equationi(struct gl_context *ctx, GLuint buf, GLenum
mode,
ctx->Color.Blend[buf].EquationA == mode)
return; /* no change */
- _mesa_flush_vertices_for_blend_state(ctx);
+ _mesa_flush_vertices_for_blend_adv(ctx, ctx->Color.BlendEnabled,
+ advanced_mode);
ctx->Color.Blend[buf].EquationRGB = mode;
ctx->Color.Blend[buf].EquationA = mode;
ctx->Color._BlendEquationPerBuffer = GL_TRUE;
diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index 2454e0c744..c95bc57896 100644
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -154,21 +154,48 @@ extern void
_mesa_init_color( struct gl_context * ctx );
+static inline enum gl_advanced_blend_mode
+_mesa_get_advanced_blend_sh_constant(GLbitfield blend_enabled,
+ enum gl_advanced_blend_mode mode)
+{
+ return blend_enabled ? mode : BLEND_NONE;
+}
+
+static inline bool
+_mesa_advanded_blend_sh_constant_changed(struct gl_context *ctx,
+ GLbitfield new_blend_enabled,
+ enum gl_advanced_blend_mode new_mode)
+{
+ return _mesa_get_advanced_blend_sh_constant(new_blend_enabled, new_mode) !=
+ _mesa_get_advanced_blend_sh_constant(ctx->Color.BlendEnabled,
+ ctx->Color._AdvancedBlendMode);
+}
+
static inline void
_mesa_flush_vertices_for_blend_state(struct gl_context *ctx)
{
- /* The advanced blend mode needs _NEW_COLOR to update the state constant,
- * so we have to set it. This is inefficient.
- * This should only be done for states that affect the state constant.
- * It shouldn't be done for other blend states.
- */
- if (_mesa_has_KHR_blend_equation_advanced(ctx) ||
- !ctx->DriverFlags.NewBlend) {
+ if (!ctx->DriverFlags.NewBlend) {
FLUSH_VERTICES(ctx, _NEW_COLOR);
} else {
FLUSH_VERTICES(ctx, 0);
+ ctx->NewDriverState |= ctx->DriverFlags.NewBlend;
+ }
+}
+
+static inline void
+_mesa_flush_vertices_for_blend_adv(struct gl_context *ctx,
+ GLbitfield new_blend_enabled,
+ enum gl_advanced_blend_mode new_mode)
+{
+ /* The advanced blend mode needs _NEW_COLOR to update the state constant. */
+ if (_mesa_has_KHR_blend_equation_advanced(ctx) &&
+ _mesa_advanded_blend_sh_constant_changed(ctx, new_blend_enabled,
+ new_mode)) {
+ FLUSH_VERTICES(ctx, _NEW_COLOR);
+ ctx->NewDriverState |= ctx->DriverFlags.NewBlend;
+ return;
}
- ctx->NewDriverState |= ctx->DriverFlags.NewBlend;
+ _mesa_flush_vertices_for_blend_state(ctx);
}
#endif
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 451a9c918f..bc22410bda 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -329,7 +329,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap,
GLboolean state)
GLbitfield newEnabled =
state * ((1 << ctx->Const.MaxDrawBuffers) - 1);
if (newEnabled != ctx->Color.BlendEnabled) {
- _mesa_flush_vertices_for_blend_state(ctx);
+ _mesa_flush_vertices_for_blend_adv(ctx, newEnabled,
+ ctx->Color._AdvancedBlendMode);
ctx->Color.BlendEnabled = newEnabled;
}
}
@@ -1198,11 +1199,16 @@ _mesa_set_enablei(struct gl_context *ctx, GLenum cap,
return;
}
if (((ctx->Color.BlendEnabled >> index) & 1) != state) {
- _mesa_flush_vertices_for_blend_state(ctx);
+ GLbitfield enabled = ctx->Color.BlendEnabled;
+
if (state)
- ctx->Color.BlendEnabled |= (1 << index);
+ enabled |= (1 << index);
else
- ctx->Color.BlendEnabled &= ~(1 << index);
+ enabled &= ~(1 << index);
+
+ _mesa_flush_vertices_for_blend_adv(ctx, enabled,
+ ctx->Color._AdvancedBlendMode);
+ ctx->Color.BlendEnabled = enabled;
}
break;
case GL_SCISSOR_TEST:
diff --git a/src/mesa/program/prog_statevars.c
b/src/mesa/program/prog_statevars.c
index b69895c47f..481123a7dc 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -598,7 +598,8 @@ _mesa_fetch_state(struct gl_context *ctx, const
gl_state_index state[],
return;
case STATE_ADVANCED_BLENDING_MODE:
- val[0].i = ctx->Color.BlendEnabled ? ctx->Color._AdvancedBlendMode :
0;
+ val[0].i = _mesa_get_advanced_blend_sh_constant(
+ ctx->Color.BlendEnabled, ctx->Color._AdvancedBlendMode);
return;
/* XXX: make sure new tokens added here are also handled in the
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
