vega: add support to VG_BLEND_LINEARDODGE_KHR blend advanced mode.

This mode is a combination of the color dodge and screen modes.
Sometimes refered to as Add mode

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 9dbfd2c347..dc79e374b0 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_EXCLUSION_KHR)
+          value > VG_BLEND_LINEARDODGE_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 ec9720004b..7c206938eb 100644
--- a/src/gallium/state_trackers/vega/asm_fill.h
+++ b/src/gallium/state_trackers/vega/asm_fill.h
@@ -875,6 +875,57 @@ blend_exclusion_khr( struct ureg_program *ureg,
 }
 
 static INLINE void
+blend_lineardodge_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_MUL(ureg, temp[2], ureg_src(temp[0]),
+            ureg_scalar(ureg_src(temp[1]), TGSI_SWIZZLE_W));
+   ureg_MUL(ureg, temp[4], ureg_src(temp[1]),
+            ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W));
+   ureg_ADD(ureg, temp[2], ureg_src(temp[2]), ureg_src(temp[4]));
+   ureg_MUL(ureg, temp[4], ureg_scalar(ureg_src(temp[0]), TGSI_SWIZZLE_W),
+            ureg_scalar(ureg_src(temp[1]), TGSI_SWIZZLE_W));
+   ureg_SLE(ureg, temp[2], ureg_src(temp[2]), 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_ADD(ureg, ureg_writemask(temp[1], TGSI_WRITEMASK_XYZ),
+            ureg_src(temp[0]), ureg_src(temp[1]));
+
+   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, ureg_writemask(temp[1], TGSI_WRITEMASK_XYZ),
+            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,
                 struct ureg_dst *out,
                 struct ureg_src *in,
@@ -1001,6 +1052,8 @@ static const struct shader_asm_info shaders_asm[] = {
     VG_TRUE,  1, 1, 2, 1, 0, 6},
    {VEGA_BLEND_EXCLUSION_KHR_SHADER, blend_exclusion_khr,
     VG_TRUE,  1, 1, 2, 1, 0, 6},
+   {VEGA_BLEND_LINEARDODGE_KHR_SHADER, blend_lineardodge_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 b2ad72ab5d..8d918b50a1 100644
--- a/src/gallium/state_trackers/vega/shader.c
+++ b/src/gallium/state_trackers/vega/shader.c
@@ -136,7 +136,8 @@ static VGint blend_bind_samplers(struct vg_context *ctx,
        bmode == VG_BLEND_DIFFERENCE_KHR ||
        bmode == VG_BLEND_SUBTRACT_KHR ||
        bmode == VG_BLEND_INVERT_KHR ||
-       bmode == VG_BLEND_EXCLUSION_KHR) {
+       bmode == VG_BLEND_EXCLUSION_KHR ||
+       bmode == VG_BLEND_LINEARDODGE_KHR) {
       struct st_framebuffer *stfb = ctx->draw_buffer;
 
       vg_prepare_blend_surface(ctx);
@@ -301,6 +302,9 @@ static void setup_shader_program(struct shader *shader)
    case VG_BLEND_EXCLUSION_KHR:
       shader_id |= VEGA_BLEND_EXCLUSION_KHR_SHADER;
       break;
+   case VG_BLEND_LINEARDODGE_KHR:
+      shader_id |= VEGA_BLEND_LINEARDODGE_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 5e476d672f..017059ca42 100644
--- a/src/gallium/state_trackers/vega/shaders_cache.c
+++ b/src/gallium/state_trackers/vega/shaders_cache.c
@@ -373,25 +373,29 @@ create_shader(struct pipe_context *pipe,
       debug_assert(shaders_asm[21].id == VEGA_BLEND_EXCLUSION_KHR_SHADER);
       shaders[idx] = &shaders_asm[21];
       ++idx;
+   } else if ((id & VEGA_BLEND_LINEARDODGE_KHR_SHADER)){
+      debug_assert(shaders_asm[22].id == VEGA_BLEND_LINEARDODGE_KHR_SHADER);
+      shaders[idx] = &shaders_asm[22];
+      ++idx;
    }
 
 
 
    /* fifth stage */
    if ((id & VEGA_PREMULTIPLY_SHADER)) {
-      debug_assert(shaders_asm[22].id == VEGA_PREMULTIPLY_SHADER);
-      shaders[idx] = &shaders_asm[22];
+      debug_assert(shaders_asm[23].id == VEGA_PREMULTIPLY_SHADER);
+      shaders[idx] = &shaders_asm[23];
       ++idx;
    } else if ((id & VEGA_UNPREMULTIPLY_SHADER)) {
-      debug_assert(shaders_asm[23].id == VEGA_UNPREMULTIPLY_SHADER);
-      shaders[idx] = &shaders_asm[23];
+      debug_assert(shaders_asm[24].id == VEGA_UNPREMULTIPLY_SHADER);
+      shaders[idx] = &shaders_asm[24];
       ++idx;
    }
 
    /* sixth stage */
    if ((id & VEGA_BW_SHADER)) {
-      debug_assert(shaders_asm[24].id == VEGA_BW_SHADER);
-      shaders[idx] = &shaders_asm[24];
+      debug_assert(shaders_asm[25].id == VEGA_BW_SHADER);
+      shaders[idx] = &shaders_asm[25];
       ++idx;
    }
 
diff --git a/src/gallium/state_trackers/vega/shaders_cache.h b/src/gallium/state_trackers/vega/shaders_cache.h
index 1d0cc0b57c..9fdbfd6702 100644
--- a/src/gallium/state_trackers/vega/shaders_cache.h
+++ b/src/gallium/state_trackers/vega/shaders_cache.h
@@ -58,11 +58,12 @@ enum VegaShaderType {
    VEGA_BLEND_SUBTRACT_KHR_SHADER      = 1 << 19,
    VEGA_BLEND_INVERT_KHR_SHADER        = 1 << 20,
    VEGA_BLEND_EXCLUSION_KHR_SHADER     = 1 << 21,
+   VEGA_BLEND_LINEARDODGE_KHR_SHADER   = 1 << 22,
 
-   VEGA_PREMULTIPLY_SHADER             = 1 << 22,
-   VEGA_UNPREMULTIPLY_SHADER           = 1 << 23,
+   VEGA_PREMULTIPLY_SHADER             = 1 << 23,
+   VEGA_UNPREMULTIPLY_SHADER           = 1 << 24,
 
-   VEGA_BW_SHADER                      = 1 << 24
+   VEGA_BW_SHADER                      = 1 << 25
 };
 
 struct vg_shader {
diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c
index 94670f3684..e7c85d8597 100644
--- a/src/gallium/state_trackers/vega/vg_context.c
+++ b/src/gallium/state_trackers/vega/vg_context.c
@@ -349,6 +349,7 @@ void vg_validate_state(struct vg_context *ctx)
       case VG_BLEND_SUBTRACT_KHR:
       case VG_BLEND_INVERT_KHR:
       case VG_BLEND_EXCLUSION_KHR:
+          case VG_BLEND_LINEARDODGE_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;