diff options
author | Igor Oliveira <igor.oliveira@openbossa.org> | 2010-02-10 17:53:05 -0400 |
---|---|---|
committer | Igor Trindade Oliveira <igor@Cygnus.(none)> | 2010-02-11 10:36:24 -0400 |
commit | 72267d697ca86c1b8667431a50df344c72da906d (patch) | |
tree | 99eecc1cd55b8e932543edc8e05e344e7eba3ce9 | |
parent | 817247803d641b928cd24a1f97e155ffa4674763 (diff) |
vega: add support to VG_BLEND_COLORDODGE_KHR advanced blend mode.
it is used by SVG1.2 and it is defined by:
Brightens the destination color to reflect the source color. Painting
with black produces no change
-rw-r--r-- | src/gallium/state_trackers/vega/api_params.c | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/vega/asm_fill.h | 54 | ||||
-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, 75 insertions, 11 deletions
diff --git a/src/gallium/state_trackers/vega/api_params.c b/src/gallium/state_trackers/vega/api_params.c index acd450527d..b645d8103e 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_SOFTLIGHT_KHR) + value > VG_BLEND_COLORDODGE_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 3d7e0ed32b..4bcd75d781 100644 --- a/src/gallium/state_trackers/vega/asm_fill.h +++ b/src/gallium/state_trackers/vega/asm_fill.h @@ -656,6 +656,58 @@ blend_softlight_khr( struct ureg_program *ureg, ureg_MOV(ureg, *out, ureg_src(temp[1])); } +static INLINE void +blend_colordodge_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) +{ + unsigned label; + + ureg_TEX(ureg, temp[1], TGSI_TEXTURE_2D, in[0], sampler[2]); + + ureg_SLT(ureg, temp[2], ureg_src(temp[0]), + ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W)); + ureg_MOV(ureg, + ureg_writemask(temp[2], TGSI_WRITEMASK_W), + ureg_scalar(constant[1], TGSI_SWIZZLE_Y)); + + EXTENDED_BLENDER_OVER_FUNC + + label = ureg_get_instruction_number(ureg); + label += 2; + + ureg_IF(ureg, ureg_src(temp[2]), &label); + ureg_MUL(ureg, temp[2], ureg_src(temp[1]), ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W)); + ureg_DIV(ureg, temp[4], ureg_src(temp[0]), ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W)); + ureg_SUB(ureg, temp[4], ureg_scalar(constant[1], TGSI_SWIZZLE_Y), ureg_src(temp[4])); + ureg_DIV(ureg, temp[4], ureg_src(temp[2]), ureg_src(temp[4])); + ureg_MUL(ureg, temp[2], ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W), + ureg_scalar(ureg_src(temp[1]), TGSI_SWIZZLE_W)); + ureg_MIN(ureg, temp[2], ureg_src(temp[2]), ureg_src(temp[4])); + ureg_ADD(ureg, temp[1], ureg_src(temp[2]), ureg_src(temp[3])); + + label = ureg_get_instruction_number(ureg); + label += 2; + ureg_ELSE(ureg, &label); + 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[1], ureg_src(temp[2]), ureg_src(temp[3])); + ureg_ENDIF(ureg); + + 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, @@ -772,6 +824,8 @@ static const struct shader_asm_info shaders_asm[] = { VG_TRUE, 1, 1, 2, 1, 0, 6}, {VEGA_BLEND_SOFTLIGHT_KHR_SHADER, blend_softlight_khr, VG_TRUE, 1, 1, 2, 1, 0, 6}, + {VEGA_BLEND_COLORDODGE_KHR_SHADER, blend_colordodge_khr, + VG_TRUE, 1, 1, 2, 1, 0, 6}, /* premultiply */ {VEGA_PREMULTIPLY_SHADER, premultiply, diff --git a/src/gallium/state_trackers/vega/shader.c b/src/gallium/state_trackers/vega/shader.c index 66af2cad06..645eaa739b 100644 --- a/src/gallium/state_trackers/vega/shader.c +++ b/src/gallium/state_trackers/vega/shader.c @@ -130,7 +130,8 @@ static VGint blend_bind_samplers(struct vg_context *ctx, bmode == VG_BLEND_OVERLAY_KHR || bmode == VG_BLEND_HARDLIGHT_KHR || bmode == VG_BLEND_SOFTLIGHT_SVG_KHR || - bmode == VG_BLEND_SOFTLIGHT_KHR) { + bmode == VG_BLEND_SOFTLIGHT_KHR || + bmode == VG_BLEND_COLORDODGE_KHR) { struct st_framebuffer *stfb = ctx->draw_buffer; vg_prepare_blend_surface(ctx); @@ -277,6 +278,9 @@ static void setup_shader_program(struct shader *shader) case VG_BLEND_SOFTLIGHT_KHR: shader_id |= VEGA_BLEND_SOFTLIGHT_KHR_SHADER; break; + case VG_BLEND_COLORDODGE_KHR: + shader_id |= VEGA_BLEND_COLORDODGE_KHR_SHADER; + break; default: /* handled by pipe_blend_state */ break; diff --git a/src/gallium/state_trackers/vega/shaders_cache.c b/src/gallium/state_trackers/vega/shaders_cache.c index d1eaa5bad6..41a78e9918 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.c +++ b/src/gallium/state_trackers/vega/shaders_cache.c @@ -349,23 +349,27 @@ create_shader(struct pipe_context *pipe, debug_assert(shaders_asm[15].id == VEGA_BLEND_SOFTLIGHT_KHR_SHADER); shaders[idx] = &shaders_asm[15]; ++idx; + } else if ((id & VEGA_BLEND_COLORDODGE_KHR_SHADER)){ + debug_assert(shaders_asm[16].id == VEGA_BLEND_COLORDODGE_KHR_SHADER); + shaders[idx] = &shaders_asm[16]; + ++idx; } /* fifth stage */ if ((id & VEGA_PREMULTIPLY_SHADER)) { - debug_assert(shaders_asm[16].id == VEGA_PREMULTIPLY_SHADER); - shaders[idx] = &shaders_asm[16]; + debug_assert(shaders_asm[17].id == VEGA_PREMULTIPLY_SHADER); + shaders[idx] = &shaders_asm[17]; ++idx; } else if ((id & VEGA_UNPREMULTIPLY_SHADER)) { - debug_assert(shaders_asm[17].id == VEGA_UNPREMULTIPLY_SHADER); - shaders[idx] = &shaders_asm[17]; + debug_assert(shaders_asm[18].id == VEGA_UNPREMULTIPLY_SHADER); + shaders[idx] = &shaders_asm[18]; ++idx; } /* sixth stage */ if ((id & VEGA_BW_SHADER)) { - debug_assert(shaders_asm[18].id == VEGA_BW_SHADER); - shaders[idx] = &shaders_asm[18]; + debug_assert(shaders_asm[19].id == VEGA_BW_SHADER); + shaders[idx] = &shaders_asm[19]; ++idx; } diff --git a/src/gallium/state_trackers/vega/shaders_cache.h b/src/gallium/state_trackers/vega/shaders_cache.h index 300e9d0e65..8403c67e81 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.h +++ b/src/gallium/state_trackers/vega/shaders_cache.h @@ -52,11 +52,12 @@ enum VegaShaderType { VEGA_BLEND_HARDLIGHT_KHR_SHADER = 1 << 13, VEGA_BLEND_SOFTLIGHT_SVG_KHR_SHADER = 1 << 14, VEGA_BLEND_SOFTLIGHT_KHR_SHADER = 1 << 15, + VEGA_BLEND_COLORDODGE_KHR_SHADER = 1 << 16, - VEGA_PREMULTIPLY_SHADER = 1 << 16, - VEGA_UNPREMULTIPLY_SHADER = 1 << 17, + VEGA_PREMULTIPLY_SHADER = 1 << 17, + VEGA_UNPREMULTIPLY_SHADER = 1 << 18, - VEGA_BW_SHADER = 1 << 18 + VEGA_BW_SHADER = 1 << 19 }; struct vg_shader { diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c index 779dbf5f3f..d60a692976 100644 --- a/src/gallium/state_trackers/vega/vg_context.c +++ b/src/gallium/state_trackers/vega/vg_context.c @@ -343,6 +343,7 @@ void vg_validate_state(struct vg_context *ctx) case VG_BLEND_HARDLIGHT_KHR: case VG_BLEND_SOFTLIGHT_SVG_KHR: case VG_BLEND_SOFTLIGHT_KHR: + case VG_BLEND_COLORDODGE_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; |