From 7825b342d5e2e9e27e3a5f0217122c5bb42f1256 Mon Sep 17 00:00:00 2001 From: Igor Oliveira Date: Thu, 11 Feb 2010 15:01:00 -0400 Subject: vega: add support to VG_BLEND_COLORBURN_KHR advanced blend mode. it is used by SVG1.2 and it is definied as: Darkens the destination color to reflect the source color. Painting with white produces no change --- src/gallium/state_trackers/vega/api_params.c | 2 +- src/gallium/state_trackers/vega/asm_fill.h | 51 +++++++++++++++++++++++++ src/gallium/state_trackers/vega/shader.c | 7 +++- src/gallium/state_trackers/vega/shaders_cache.c | 17 ++++++--- src/gallium/state_trackers/vega/shaders_cache.h | 7 ++-- src/gallium/state_trackers/vega/vg_context.c | 1 + 6 files changed, 74 insertions(+), 11 deletions(-) diff --git a/src/gallium/state_trackers/vega/api_params.c b/src/gallium/state_trackers/vega/api_params.c index b645d8103e..f2a0de56ba 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_COLORDODGE_KHR) + value > VG_BLEND_COLORBURN_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 4bcd75d781..74b8988a88 100644 --- a/src/gallium/state_trackers/vega/asm_fill.h +++ b/src/gallium/state_trackers/vega/asm_fill.h @@ -709,6 +709,55 @@ blend_colordodge_khr( struct ureg_program *ureg, } +static INLINE void +blend_colorburn_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_XOR(ureg, temp[4], ureg_src(temp[4]), ureg_src(temp[4])); + ureg_SGT(ureg, temp[2], ureg_src(temp[0]), ureg_src(temp[4])); + + EXTENDED_BLENDER_OVER_FUNC + + label = ureg_get_instruction_number(ureg); + label += 2; + + ureg_IF(ureg, ureg_src(temp[2]), &label); + ureg_SUB(ureg, temp[2], ureg_scalar(ureg_src(temp[1]), TGSI_SWIZZLE_W), + ureg_src(temp[1])); + ureg_MUL(ureg, temp[2], ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W), + ureg_src(temp[2])); + ureg_DIV(ureg, temp[2], ureg_src(temp[2]), ureg_src(temp[0])); + ureg_MUL(ureg, temp[4], 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_SUB(ureg, temp[2], ureg_src(temp[4]), ureg_src(temp[2])); + 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_MOV(ureg, temp[1], 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, struct ureg_dst *out, @@ -826,6 +875,8 @@ static const struct shader_asm_info shaders_asm[] = { VG_TRUE, 1, 1, 2, 1, 0, 6}, {VEGA_BLEND_COLORDODGE_KHR_SHADER, blend_colordodge_khr, VG_TRUE, 1, 1, 2, 1, 0, 6}, + {VEGA_BLEND_COLORBURN_KHR_SHADER, blend_colorburn_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 645eaa739b..7d36bcd61e 100644 --- a/src/gallium/state_trackers/vega/shader.c +++ b/src/gallium/state_trackers/vega/shader.c @@ -131,7 +131,8 @@ static VGint blend_bind_samplers(struct vg_context *ctx, bmode == VG_BLEND_HARDLIGHT_KHR || bmode == VG_BLEND_SOFTLIGHT_SVG_KHR || bmode == VG_BLEND_SOFTLIGHT_KHR || - bmode == VG_BLEND_COLORDODGE_KHR) { + bmode == VG_BLEND_COLORDODGE_KHR || + bmode == VG_BLEND_COLORBURN_KHR) { struct st_framebuffer *stfb = ctx->draw_buffer; vg_prepare_blend_surface(ctx); @@ -281,6 +282,10 @@ static void setup_shader_program(struct shader *shader) case VG_BLEND_COLORDODGE_KHR: shader_id |= VEGA_BLEND_COLORDODGE_KHR_SHADER; break; + case VG_BLEND_COLORBURN_KHR: + shader_id |= VEGA_BLEND_COLORBURN_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 41a78e9918..d605950caf 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.c +++ b/src/gallium/state_trackers/vega/shaders_cache.c @@ -353,23 +353,28 @@ create_shader(struct pipe_context *pipe, debug_assert(shaders_asm[16].id == VEGA_BLEND_COLORDODGE_KHR_SHADER); shaders[idx] = &shaders_asm[16]; ++idx; + } else if ((id & VEGA_BLEND_COLORBURN_KHR_SHADER)){ + debug_assert(shaders_asm[17].id == VEGA_BLEND_COLORBURN_KHR_SHADER); + shaders[idx] = &shaders_asm[17]; + ++idx; } + /* fifth stage */ if ((id & VEGA_PREMULTIPLY_SHADER)) { - debug_assert(shaders_asm[17].id == VEGA_PREMULTIPLY_SHADER); - shaders[idx] = &shaders_asm[17]; + debug_assert(shaders_asm[18].id == VEGA_PREMULTIPLY_SHADER); + shaders[idx] = &shaders_asm[18]; ++idx; } else if ((id & VEGA_UNPREMULTIPLY_SHADER)) { - debug_assert(shaders_asm[18].id == VEGA_UNPREMULTIPLY_SHADER); - shaders[idx] = &shaders_asm[18]; + debug_assert(shaders_asm[19].id == VEGA_UNPREMULTIPLY_SHADER); + shaders[idx] = &shaders_asm[19]; ++idx; } /* sixth stage */ if ((id & VEGA_BW_SHADER)) { - debug_assert(shaders_asm[19].id == VEGA_BW_SHADER); - shaders[idx] = &shaders_asm[19]; + debug_assert(shaders_asm[20].id == VEGA_BW_SHADER); + shaders[idx] = &shaders_asm[20]; ++idx; } diff --git a/src/gallium/state_trackers/vega/shaders_cache.h b/src/gallium/state_trackers/vega/shaders_cache.h index 8403c67e81..07733061bd 100644 --- a/src/gallium/state_trackers/vega/shaders_cache.h +++ b/src/gallium/state_trackers/vega/shaders_cache.h @@ -53,11 +53,12 @@ enum VegaShaderType { VEGA_BLEND_SOFTLIGHT_SVG_KHR_SHADER = 1 << 14, VEGA_BLEND_SOFTLIGHT_KHR_SHADER = 1 << 15, VEGA_BLEND_COLORDODGE_KHR_SHADER = 1 << 16, + VEGA_BLEND_COLORBURN_KHR_SHADER = 1 << 17, - VEGA_PREMULTIPLY_SHADER = 1 << 17, - VEGA_UNPREMULTIPLY_SHADER = 1 << 18, + VEGA_PREMULTIPLY_SHADER = 1 << 18, + VEGA_UNPREMULTIPLY_SHADER = 1 << 19, - VEGA_BW_SHADER = 1 << 19 + VEGA_BW_SHADER = 1 << 20 }; struct vg_shader { diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c index d60a692976..488d99e3df 100644 --- a/src/gallium/state_trackers/vega/vg_context.c +++ b/src/gallium/state_trackers/vega/vg_context.c @@ -344,6 +344,7 @@ void vg_validate_state(struct vg_context *ctx) case VG_BLEND_SOFTLIGHT_SVG_KHR: case VG_BLEND_SOFTLIGHT_KHR: case VG_BLEND_COLORDODGE_KHR: + case VG_BLEND_COLORBURN_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; -- cgit v1.2.3