frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Reuse the glamor_program_alpha_* enums for Render. 

This is a step toward using glamor_program.c for Render acceleration.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2016-01-26 15:56:27 -08:00
parent 9b676786de
commit 0dbce65b08
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glamor/glamor_priv.h
View File

@ -107,14 +107,6 @@ enum shader_mask {
SHADER_MASK_COUNT, 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 { enum shader_dest_swizzle {
SHADER_DEST_SWIZZLE_DEFAULT, SHADER_DEST_SWIZZLE_DEFAULT,
SHADER_DEST_SWIZZLE_ALPHA_TO_RED, SHADER_DEST_SWIZZLE_ALPHA_TO_RED,
@ -124,7 +116,7 @@ enum shader_dest_swizzle {
struct shader_key { struct shader_key {
enum shader_source source; enum shader_source source;
enum shader_mask mask; enum shader_mask mask;
enum shader_in in; glamor_program_alpha in;
enum shader_dest_swizzle dest_swizzle; enum shader_dest_swizzle dest_swizzle;
}; };
@ -291,7 +283,7 @@ typedef struct glamor_screen_private {
int render_nr_quads; int render_nr_quads;
glamor_composite_shader composite_shader[SHADER_SOURCE_COUNT] glamor_composite_shader composite_shader[SHADER_SOURCE_COUNT]
[SHADER_MASK_COUNT] [SHADER_MASK_COUNT]
[SHADER_IN_COUNT] [glamor_program_alpha_count]
[SHADER_DEST_SWIZZLE_COUNT]; [SHADER_DEST_SWIZZLE_COUNT];
/* shaders to restore a texture to another texture. */ /* shaders to restore a texture to another texture. */

28
glamor/glamor_render.c
View File

@ -278,16 +278,16 @@ glamor_create_composite_fs(struct shader_key *key)
header = header_norm; header = header_norm;
switch (key->in) { switch (key->in) {
case SHADER_IN_NORMAL: case glamor_program_alpha_normal:
in = in_normal; in = in_normal;
break; break;
case SHADER_IN_CA_SOURCE: case glamor_program_alpha_ca_first:
in = in_ca_source; in = in_ca_source;
break; break;
case SHADER_IN_CA_ALPHA: case glamor_program_alpha_ca_second:
in = in_ca_alpha; in = in_ca_alpha;
break; break;
case SHADER_IN_CA_DUAL_BLEND: case glamor_program_alpha_dual_blend:
in = in_ca_dual_blend; in = in_ca_dual_blend;
header = header_ca_dual_blend; header = header_ca_dual_blend;
break; 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_SOURCE, "v_texcoord0");
glBindAttribLocation(prog, GLAMOR_VERTEX_MASK, "v_texcoord1"); 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, 0, "color0");
glBindFragDataLocationIndexed(prog, 0, 1, "color1"); glBindFragDataLocationIndexed(prog, 0, 1, "color1");
} }
@ -674,7 +674,7 @@ static const int pict_format_combine_tab[][3] = {
static Bool static Bool
combine_pict_format(PictFormatShort * des, const PictFormatShort src, 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; PictFormatShort new_vis;
int src_type, mask_type, src_bpp; 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); new_vis = PICT_FORMAT_VIS(src) | PICT_FORMAT_VIS(mask);
switch (in_ca) { switch (in_ca) {
case SHADER_IN_NORMAL: case glamor_program_alpha_normal:
src_type = PICT_FORMAT_TYPE(src); src_type = PICT_FORMAT_TYPE(src);
mask_type = PICT_TYPE_A; mask_type = PICT_TYPE_A;
break; break;
case SHADER_IN_CA_SOURCE: case glamor_program_alpha_ca_first:
src_type = PICT_FORMAT_TYPE(src); src_type = PICT_FORMAT_TYPE(src);
mask_type = PICT_FORMAT_TYPE(mask); mask_type = PICT_FORMAT_TYPE(mask);
break; break;
case SHADER_IN_CA_ALPHA: case glamor_program_alpha_ca_second:
src_type = PICT_TYPE_A; src_type = PICT_TYPE_A;
mask_type = PICT_FORMAT_TYPE(mask); mask_type = PICT_FORMAT_TYPE(mask);
break; break;
case SHADER_IN_CA_DUAL_BLEND: case glamor_program_alpha_dual_blend:
src_type = PICT_FORMAT_TYPE(src); src_type = PICT_FORMAT_TYPE(src);
mask_type = PICT_FORMAT_TYPE(mask); mask_type = PICT_FORMAT_TYPE(mask);
break; break;
@ -867,19 +867,19 @@ glamor_composite_choose_shader(CARD8 op,
} }
if (!mask->componentAlpha) { if (!mask->componentAlpha) {
key.in = SHADER_IN_NORMAL; key.in = glamor_program_alpha_normal;
} }
else { else {
if (op == PictOpClear) if (op == PictOpClear)
key.mask = SHADER_MASK_NONE; key.mask = SHADER_MASK_NONE;
else if (glamor_priv->has_dual_blend) 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 else if (op == PictOpSrc || op == PictOpAdd
|| op == PictOpIn || op == PictOpOut || op == PictOpIn || op == PictOpOut
|| op == PictOpOverReverse) || op == PictOpOverReverse)
key.in = SHADER_IN_CA_SOURCE; key.in = glamor_program_alpha_ca_second;
else if (op == PictOpOutReverse || op == PictOpInReverse) { else if (op == PictOpOutReverse || op == PictOpInReverse) {
key.in = SHADER_IN_CA_ALPHA; key.in = glamor_program_alpha_ca_first;
} }
else { else {
glamor_fallback("Unsupported component alpha op: %d\n", op); glamor_fallback("Unsupported component alpha op: %d\n", op);