diff options
author | Eric Anholt <eric@anholt.net> | 2016-01-26 15:56:27 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2016-01-26 15:56:27 -0800 |
commit | 60f263f48ecfc66174181d27d484117ba7e94cef (patch) | |
tree | d02df822443b6f85806f1edbbcd0267ef14cf020 | |
parent | d4bde8b959038496d58b518e1e734eb0b66d9dd3 (diff) |
glamor: Reuse the glamor_program_alpha_* enums for Render.glamor-render-program
This is a step toward using glamor_program.c for Render acceleration.
Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | glamor/glamor_priv.h | 12 | ||||
-rw-r--r-- | glamor/glamor_render.c | 28 |
2 files changed, 16 insertions, 24 deletions
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index b70533abe..60b0a66c5 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -107,14 +107,6 @@ enum shader_mask { SHADER_MASK_COUNT, }; -enum shader_in { - SHADER_IN_NORMAL, - SHADER_IN_CA_SOURCE, - SHADER_IN_CA_ALPHA, - SHADER_IN_CA_DUAL_BLEND, - SHADER_IN_COUNT, -}; - enum shader_dest_swizzle { SHADER_DEST_SWIZZLE_DEFAULT, SHADER_DEST_SWIZZLE_ALPHA_TO_RED, @@ -124,7 +116,7 @@ enum shader_dest_swizzle { struct shader_key { enum shader_source source; enum shader_mask mask; - enum shader_in in; + glamor_program_alpha in; enum shader_dest_swizzle dest_swizzle; }; @@ -291,7 +283,7 @@ typedef struct glamor_screen_private { int render_nr_quads; glamor_composite_shader composite_shader[SHADER_SOURCE_COUNT] [SHADER_MASK_COUNT] - [SHADER_IN_COUNT] + [glamor_program_alpha_count] [SHADER_DEST_SWIZZLE_COUNT]; /* shaders to restore a texture to another texture. */ diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index d1b7a1594..ec757b314 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -278,16 +278,16 @@ glamor_create_composite_fs(struct shader_key *key) header = header_norm; switch (key->in) { - case SHADER_IN_NORMAL: + case glamor_program_alpha_normal: in = in_normal; break; - case SHADER_IN_CA_SOURCE: + case glamor_program_alpha_ca_first: in = in_ca_source; break; - case SHADER_IN_CA_ALPHA: + case glamor_program_alpha_ca_second: in = in_ca_alpha; break; - case SHADER_IN_CA_DUAL_BLEND: + case glamor_program_alpha_dual_blend: in = in_ca_dual_blend; header = header_ca_dual_blend; break; @@ -368,7 +368,7 @@ glamor_create_composite_shader(ScreenPtr screen, struct shader_key *key, glBindAttribLocation(prog, GLAMOR_VERTEX_SOURCE, "v_texcoord0"); glBindAttribLocation(prog, GLAMOR_VERTEX_MASK, "v_texcoord1"); - if (key->in == SHADER_IN_CA_DUAL_BLEND) { + if (key->in == glamor_program_alpha_dual_blend) { glBindFragDataLocationIndexed(prog, 0, 0, "color0"); glBindFragDataLocationIndexed(prog, 0, 1, "color1"); } @@ -674,7 +674,7 @@ static const int pict_format_combine_tab[][3] = { static Bool combine_pict_format(PictFormatShort * des, const PictFormatShort src, - const PictFormatShort mask, enum shader_in in_ca) + const PictFormatShort mask, glamor_program_alpha in_ca) { PictFormatShort new_vis; int src_type, mask_type, src_bpp; @@ -691,19 +691,19 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src, new_vis = PICT_FORMAT_VIS(src) | PICT_FORMAT_VIS(mask); switch (in_ca) { - case SHADER_IN_NORMAL: + case glamor_program_alpha_normal: src_type = PICT_FORMAT_TYPE(src); mask_type = PICT_TYPE_A; break; - case SHADER_IN_CA_SOURCE: + case glamor_program_alpha_ca_first: src_type = PICT_FORMAT_TYPE(src); mask_type = PICT_FORMAT_TYPE(mask); break; - case SHADER_IN_CA_ALPHA: + case glamor_program_alpha_ca_second: src_type = PICT_TYPE_A; mask_type = PICT_FORMAT_TYPE(mask); break; - case SHADER_IN_CA_DUAL_BLEND: + case glamor_program_alpha_dual_blend: src_type = PICT_FORMAT_TYPE(src); mask_type = PICT_FORMAT_TYPE(mask); break; @@ -867,19 +867,19 @@ glamor_composite_choose_shader(CARD8 op, } if (!mask->componentAlpha) { - key.in = SHADER_IN_NORMAL; + key.in = glamor_program_alpha_normal; } else { if (op == PictOpClear) key.mask = SHADER_MASK_NONE; else if (glamor_priv->has_dual_blend) - key.in = SHADER_IN_CA_DUAL_BLEND; + key.in = glamor_program_alpha_dual_blend; else if (op == PictOpSrc || op == PictOpAdd || op == PictOpIn || op == PictOpOut || op == PictOpOverReverse) - key.in = SHADER_IN_CA_SOURCE; + key.in = glamor_program_alpha_ca_second; else if (op == PictOpOutReverse || op == PictOpInReverse) { - key.in = SHADER_IN_CA_ALPHA; + key.in = glamor_program_alpha_ca_first; } else { glamor_fallback("Unsupported component alpha op: %d\n", op); |