Mesa (master): mesa: do not use bitfields for advanced-blend state
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jul 17 06:37:06 UTC 2020
Module: Mesa
Branch: master
Commit: 6ffa0e925495bf8104a2d7e6984b50b5c3584c67
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ffa0e925495bf8104a2d7e6984b50b5c3584c67
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Wed Jun 24 15:40:34 2020 +0200
mesa: do not use bitfields for advanced-blend state
Signed-off-by: Elie Tournier <elie.tournier at collabora.com>
Reviewed-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5516>
---
src/compiler/glsl/glsl_parser.yy | 32 ++++++++++----------
.../glsl/lower_blend_equation_advanced.cpp | 4 +--
src/compiler/shader_enums.h | 35 ++++++++++------------
src/mesa/main/draw_validate.c | 2 +-
4 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
index 944329a92d8..ec2dd6a0513 100644
--- a/src/compiler/glsl/glsl_parser.yy
+++ b/src/compiler/glsl/glsl_parser.yy
@@ -1598,22 +1598,22 @@ layout_qualifier_id:
const char *s;
uint32_t mask;
} map[] = {
- { "blend_support_multiply", BLEND_MULTIPLY },
- { "blend_support_screen", BLEND_SCREEN },
- { "blend_support_overlay", BLEND_OVERLAY },
- { "blend_support_darken", BLEND_DARKEN },
- { "blend_support_lighten", BLEND_LIGHTEN },
- { "blend_support_colordodge", BLEND_COLORDODGE },
- { "blend_support_colorburn", BLEND_COLORBURN },
- { "blend_support_hardlight", BLEND_HARDLIGHT },
- { "blend_support_softlight", BLEND_SOFTLIGHT },
- { "blend_support_difference", BLEND_DIFFERENCE },
- { "blend_support_exclusion", BLEND_EXCLUSION },
- { "blend_support_hsl_hue", BLEND_HSL_HUE },
- { "blend_support_hsl_saturation", BLEND_HSL_SATURATION },
- { "blend_support_hsl_color", BLEND_HSL_COLOR },
- { "blend_support_hsl_luminosity", BLEND_HSL_LUMINOSITY },
- { "blend_support_all_equations", BLEND_ALL },
+ { "blend_support_multiply", BITFIELD_BIT(BLEND_MULTIPLY) },
+ { "blend_support_screen", BITFIELD_BIT(BLEND_SCREEN) },
+ { "blend_support_overlay", BITFIELD_BIT(BLEND_OVERLAY) },
+ { "blend_support_darken", BITFIELD_BIT(BLEND_DARKEN) },
+ { "blend_support_lighten", BITFIELD_BIT(BLEND_LIGHTEN) },
+ { "blend_support_colordodge", BITFIELD_BIT(BLEND_COLORDODGE) },
+ { "blend_support_colorburn", BITFIELD_BIT(BLEND_COLORBURN) },
+ { "blend_support_hardlight", BITFIELD_BIT(BLEND_HARDLIGHT) },
+ { "blend_support_softlight", BITFIELD_BIT(BLEND_SOFTLIGHT) },
+ { "blend_support_difference", BITFIELD_BIT(BLEND_DIFFERENCE) },
+ { "blend_support_exclusion", BITFIELD_BIT(BLEND_EXCLUSION) },
+ { "blend_support_hsl_hue", BITFIELD_BIT(BLEND_HSL_HUE) },
+ { "blend_support_hsl_saturation", BITFIELD_BIT(BLEND_HSL_SATURATION) },
+ { "blend_support_hsl_color", BITFIELD_BIT(BLEND_HSL_COLOR) },
+ { "blend_support_hsl_luminosity", BITFIELD_BIT(BLEND_HSL_LUMINOSITY) },
+ { "blend_support_all_equations", (1u << (BLEND_HSL_LUMINOSITY + 1)) - 2 },
};
for (unsigned i = 0; i < ARRAY_SIZE(map); i++) {
if (match_layout_qualifier($1, map[i].s, state) == 0) {
diff --git a/src/compiler/glsl/lower_blend_equation_advanced.cpp b/src/compiler/glsl/lower_blend_equation_advanced.cpp
index c85b39bcaa3..76d4c8b7be4 100644
--- a/src/compiler/glsl/lower_blend_equation_advanced.cpp
+++ b/src/compiler/glsl/lower_blend_equation_advanced.cpp
@@ -329,8 +329,7 @@ calc_blend_result(ir_factory f,
unsigned choices = blend_qualifiers;
while (choices) {
- enum gl_advanced_blend_mode choice = (enum gl_advanced_blend_mode)
- (1u << u_bit_scan(&choices));
+ enum gl_advanced_blend_mode choice = (enum gl_advanced_blend_mode)u_bit_scan(&choices);
ir_if *iff = new(mem_ctx) ir_if(is_mode(mode, choice));
casefactory.emit(iff);
@@ -385,7 +384,6 @@ calc_blend_result(ir_factory f,
set_lum(&casefactory, factor, dst_rgb, src_rgb);
break;
case BLEND_NONE:
- case BLEND_ALL:
unreachable("not real cases");
}
diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h
index 440d853aec5..4ef3512849f 100644
--- a/src/compiler/shader_enums.h
+++ b/src/compiler/shader_enums.h
@@ -772,25 +772,22 @@ enum gl_access_qualifier
*/
enum gl_advanced_blend_mode
{
- BLEND_NONE = 0x0000,
-
- BLEND_MULTIPLY = 0x0001,
- BLEND_SCREEN = 0x0002,
- BLEND_OVERLAY = 0x0004,
- BLEND_DARKEN = 0x0008,
- BLEND_LIGHTEN = 0x0010,
- BLEND_COLORDODGE = 0x0020,
- BLEND_COLORBURN = 0x0040,
- BLEND_HARDLIGHT = 0x0080,
- BLEND_SOFTLIGHT = 0x0100,
- BLEND_DIFFERENCE = 0x0200,
- BLEND_EXCLUSION = 0x0400,
- BLEND_HSL_HUE = 0x0800,
- BLEND_HSL_SATURATION = 0x1000,
- BLEND_HSL_COLOR = 0x2000,
- BLEND_HSL_LUMINOSITY = 0x4000,
-
- BLEND_ALL = 0x7fff,
+ BLEND_NONE = 0,
+ BLEND_MULTIPLY,
+ BLEND_SCREEN,
+ BLEND_OVERLAY,
+ BLEND_DARKEN,
+ BLEND_LIGHTEN,
+ BLEND_COLORDODGE,
+ BLEND_COLORBURN,
+ BLEND_HARDLIGHT,
+ BLEND_SOFTLIGHT,
+ BLEND_DIFFERENCE,
+ BLEND_EXCLUSION,
+ BLEND_HSL_HUE,
+ BLEND_HSL_SATURATION,
+ BLEND_HSL_COLOR,
+ BLEND_HSL_LUMINOSITY,
};
enum blend_func
diff --git a/src/mesa/main/draw_validate.c b/src/mesa/main/draw_validate.c
index 5a1f6d2a194..36734c52445 100644
--- a/src/mesa/main/draw_validate.c
+++ b/src/mesa/main/draw_validate.c
@@ -101,7 +101,7 @@ check_blend_func_error(struct gl_context *ctx)
const struct gl_program *prog = ctx->FragmentProgram._Current;
const GLbitfield blend_support = !prog ? 0 : prog->sh.fs.BlendSupport;
- if ((blend_support & ctx->Color._AdvancedBlendMode) == 0) {
+ if ((blend_support & BITFIELD_BIT(ctx->Color._AdvancedBlendMode)) == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"fragment shader does not allow advanced blending mode "
"(%s)",
More information about the mesa-commit
mailing list