diff options
author | Igor Oliveira <igor.oliveira@openbossa.org> | 2010-02-12 09:44:55 -0400 |
---|---|---|
committer | Igor Trindade Oliveira <igor@Cygnus.(none)> | 2010-02-12 09:44:55 -0400 |
commit | 86439e03741c35d65fd17afb113ec2beac671293 (patch) | |
tree | b73e3fd4aa9d8e0c6e7f7c99f7b0dd808bb04eb7 | |
parent | d66cffb6375329061b55d583e0636cbad9054723 (diff) |
vega: add support to VG_BLEND_INVERT_KHR advanced blend mode.
It is defined as:
inverted version of the dst with the original dst under control of src alpha
-rw-r--r-- | src/gallium/state_trackers/vega/api_params.c | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/asm_fill.h | 32 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/shader.c | 6 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/shaders_cache.c | 16 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/shaders_cache.h | 7 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/vg_context.c | 1 |
6 files changed, 53 insertions, 11 deletions
diff --git a/src/gallium/state_trackers/vega/api_params.c b/src/gallium/state_trackers/vega/api_params.c index 37f0991ada..e33ec0bc50 100644 --- a/src/gallium/state_trackers/vega/api_params.c +++ b/src/gallium/state_trackers/vega/api_params.c @@ -161,7 +161,7 @@ void vgSeti (VGParamType type, VGint value) break; case VG_BLEND_MODE: if (value < VG_BLEND_SRC || - value > VG_BLEND_SUBTRACT_KHR) + value > VG_BLEND_INVERT_KHR) error = VG_ILLEGAL_ARGUMENT_ERROR; else { ctx->state.dirty |= BLEND_DIRTY; diff --git a/src/gallium/state_trackers/vega/asm_fill.h b/src/gallium/state_trackers/vega/asm_fill.h index c8b6a9dbea..1b57fefe41 100644 --- a/src/gallium/state_trackers/vega/asm_fill.h +++ b/src/gallium/state_trackers/vega/asm_fill.h @@ -813,6 +813,36 @@ blend_subtract_khr( struct ureg_program *ureg, } static INLINE void +blend_invert_khr( struct ureg_program *ureg, + struct ureg_dst *out, + struct ureg_src *in, + struct ureg_src *sampler, + struct ureg_dst *temp, + struct ureg_src *constant) +{ + ureg_TEX(ureg, temp[1], TGSI_TEXTURE_2D, in[0], sampler[2]); + ureg_SUB(ureg, temp[2], ureg_scalar(constant[1], TGSI_SWIZZLE_Y), + ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_Y)); + ureg_MUL(ureg, temp[2], ureg_src(temp[1]), ureg_src(temp[2])); + ureg_SUB(ureg, temp[3], ureg_scalar(constant[1], TGSI_SWIZZLE_Y), + ureg_src(temp[1])); + ureg_MUL(ureg, temp[3], ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W), + ureg_src(temp[3])); + ureg_ADD(ureg, ureg_writemask(temp[1], TGSI_WRITEMASK_XYZ), + ureg_src(temp[2]), ureg_src(temp[3])); + + ureg_MUL(ureg, temp[2], ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W), + ureg_scalar(ureg_src(temp[1]), TGSI_SWIZZLE_W)); + ureg_ADD(ureg, temp[3], ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W), + ureg_scalar(ureg_src(temp[1]), TGSI_SWIZZLE_W)); + ureg_SUB(ureg, ureg_writemask(temp[1], TGSI_WRITEMASK_W), + ureg_src(temp[3]), ureg_src(temp[2])); + + + ureg_MOV(ureg, *out, ureg_src(temp[1])); +} + +static INLINE void premultiply( struct ureg_program *ureg, struct ureg_dst *out, struct ureg_src *in, @@ -935,6 +965,8 @@ static const struct shader_asm_info shaders_asm[] = { VG_TRUE, 1, 1, 2, 1, 0, 6}, {VEGA_BLEND_SUBTRACT_KHR_SHADER, blend_subtract_khr, VG_TRUE, 1, 1, 2, 1, 0, 6}, + {VEGA_BLEND_INVERT_KHR_SHADER, blend_invert_khr, + VG_TRUE, 1, 1, 2, 1, 0, 6}, /* premultiply */ diff --git a/src/gallium/state_trackers/vega/shader.c b/src/gallium/state_trackers/vega/shader.c index 8b59576d93..0a710c1948 100644 --- a/src/gallium/state_trackers/vega/shader.c +++ b/src/gallium/state_trackers/vega/shader.c @@ -134,7 +134,8 @@ static VGint blend_bind_samplers(struct vg_context *ctx, bmode == VG_BLEND_COLORDODGE_KHR || bmode == VG_BLEND_COLORBURN_KHR || bmode == VG_BLEND_DIFFERENCE_KHR || - bmode == VG_BLEND_SUBTRACT_KHR) { + bmode == VG_BLEND_SUBTRACT_KHR || + bmode == VG_BLEND_INVERT_KHR) { struct st_framebuffer *stfb = ctx->draw_buffer; vg_prepare_blend_surface(ctx); @@ -293,6 +294,9 @@ static void setup_shader_program(struct shader *shader) case VG_BLEND_SUBTRACT_KHR: shader_id |= VEGA_BLEND_SUBTRACT_KHR_SHADER; break; + case VG_BLEND_INVERT_KHR: + shader_id |= VEGA_BLEND_INVERT_KHR_SHADER; + break; default: /* handled by pipe_blend_state */ diff --git a/src/gallium/state_trackers/vega/shaders_cache.c b/src/gallium/state_trackers/vega/shaders_cache.c index 6fe70029c5..ba85c4e680 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.c +++ b/src/gallium/state_trackers/vega/shaders_cache.c @@ -365,25 +365,29 @@ create_shader(struct pipe_context *pipe, debug_assert(shaders_asm[19].id == VEGA_BLEND_SUBTRACT_KHR_SHADER); shaders[idx] = &shaders_asm[19]; ++idx; + } else if ((id & VEGA_BLEND_INVERT_KHR_SHADER)){ + debug_assert(shaders_asm[20].id == VEGA_BLEND_INVERT_KHR_SHADER); + shaders[idx] = &shaders_asm[20]; + ++idx; } /* fifth stage */ if ((id & VEGA_PREMULTIPLY_SHADER)) { - debug_assert(shaders_asm[20].id == VEGA_PREMULTIPLY_SHADER); - shaders[idx] = &shaders_asm[20]; + debug_assert(shaders_asm[21].id == VEGA_PREMULTIPLY_SHADER); + shaders[idx] = &shaders_asm[21]; ++idx; } else if ((id & VEGA_UNPREMULTIPLY_SHADER)) { - debug_assert(shaders_asm[21].id == VEGA_UNPREMULTIPLY_SHADER); - shaders[idx] = &shaders_asm[21]; + debug_assert(shaders_asm[22].id == VEGA_UNPREMULTIPLY_SHADER); + shaders[idx] = &shaders_asm[22]; ++idx; } /* sixth stage */ if ((id & VEGA_BW_SHADER)) { - debug_assert(shaders_asm[22].id == VEGA_BW_SHADER); - shaders[idx] = &shaders_asm[22]; + debug_assert(shaders_asm[23].id == VEGA_BW_SHADER); + shaders[idx] = &shaders_asm[23]; ++idx; } diff --git a/src/gallium/state_trackers/vega/shaders_cache.h b/src/gallium/state_trackers/vega/shaders_cache.h index d73751868f..93f5909f26 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.h +++ b/src/gallium/state_trackers/vega/shaders_cache.h @@ -56,11 +56,12 @@ enum VegaShaderType { VEGA_BLEND_COLORBURN_KHR_SHADER = 1 << 17, VEGA_BLEND_DIFFERENCE_KHR_SHADER = 1 << 18, VEGA_BLEND_SUBTRACT_KHR_SHADER = 1 << 19, + VEGA_BLEND_INVERT_KHR_SHADER = 1 << 20, - VEGA_PREMULTIPLY_SHADER = 1 << 20, - VEGA_UNPREMULTIPLY_SHADER = 1 << 21, + VEGA_PREMULTIPLY_SHADER = 1 << 21, + VEGA_UNPREMULTIPLY_SHADER = 1 << 22, - VEGA_BW_SHADER = 1 << 22 + VEGA_BW_SHADER = 1 << 23 }; struct vg_shader { diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c index 41c7149009..5ba02a2ee6 100644 --- a/src/gallium/state_trackers/vega/vg_context.c +++ b/src/gallium/state_trackers/vega/vg_context.c @@ -347,6 +347,7 @@ void vg_validate_state(struct vg_context *ctx) case VG_BLEND_COLORBURN_KHR: case VG_BLEND_DIFFERENCE_KHR: case VG_BLEND_SUBTRACT_KHR: + case VG_BLEND_INVERT_KHR: blend->rt[0].rgb_src_factor = PIPE_BLENDFACTOR_ONE; blend->rt[0].alpha_src_factor = PIPE_BLENDFACTOR_ONE; blend->rt[0].rgb_dst_factor = PIPE_BLENDFACTOR_ZERO; |