Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpu: Use variations for the mask mode

Browse Source
This commit is contained in:
Benjamin Otte
2023-12-31 06:14:34 +01:00
parent 2ce60f1260
commit 4100436c50
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gsk/gpu/gskgpumaskop.c
View File

@@ -69,7 +69,7 @@ gsk_gpu_mask_op (GskGpuFrame *frame,
gsk_gpu_shader_op_alloc (frame,
&GSK_GPU_MASK_OP_CLASS,
0,
mask_mode,
clip,
desc,
&instance);
@@ -79,6 +79,5 @@ gsk_gpu_mask_op (GskGpuFrame *frame,
instance->source_id = source_descriptor;
gsk_gpu_rect_to_float (mask_rect, offset, instance->mask_rect);
instance->mask_id = mask_descriptor;
instance->mask_mode = mask_mode;
instance->opacity = opacity;
}

11
gsk/gpu/shaders/gskgpumask.glsl
View File

@@ -1,5 +1,7 @@
#include "common.glsl"
#define VARIATION_MASK_MODE GSK_VARIATION
PASS(0) vec2 _pos;
PASS_FLAT(1) Rect _source_rect;
PASS_FLAT(2) Rect _mask_rect;
@@ -7,8 +9,7 @@ PASS(3) vec2 _source_coord;
PASS(4) vec2 _mask_coord;
PASS_FLAT(5) uint _source_id;
PASS_FLAT(6) uint _mask_id;
PASS_FLAT(7) uint _mask_mode;
PASS_FLAT(8) float _opacity;
PASS_FLAT(7) float _opacity;
#ifdef GSK_VERTEX_SHADER
@@ -18,8 +19,7 @@ IN(1) vec4 in_source_rect;
IN(2) uint in_source_id;
IN(3) vec4 in_mask_rect;
IN(4) uint in_mask_id;
IN(5) uint in_mask_mode;
IN(6) float in_opacity;
IN(5) float in_opacity;
void
run (out vec2 pos)
@@ -37,7 +37,6 @@ run (out vec2 pos)
_mask_rect = mask_rect;
_mask_coord = rect_get_coord (mask_rect, pos);
_mask_id = in_mask_id;
_mask_mode = in_mask_mode;
_opacity = in_opacity;
}
@@ -57,7 +56,7 @@ run (out vec4 color,
rect_coverage (_mask_rect, _pos);
float alpha = _opacity;
switch (_mask_mode)
switch (VARIATION_MASK_MODE)
{
case GSK_MASK_MODE_ALPHA:
alpha *= mask.a;