diff options
| author | Erik Faye-Lund <[email protected]> | 2020-06-24 15:40:34 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-07-17 06:19:16 +0000 |
| commit | 6ffa0e925495bf8104a2d7e6984b50b5c3584c67 (patch) | |
| tree | 243b43e21f2b918a46ea7aabe21449830d7f4349 /src/compiler/glsl | |
| parent | c36aac542a3df76f192e61d1132ff4a1bfbef9fb (diff) | |
mesa: do not use bitfields for advanced-blend state
Signed-off-by: Elie Tournier <[email protected]>
Reviewed-by: Gert Wollny <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5516>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 32 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_blend_equation_advanced.cpp | 4 |
2 files changed, 17 insertions, 19 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"); } |