fixup! backend: gl: support scale_x/scale_y blit parameters

yshui · May 11, 2024 · 47a8fd1 · 47a8fd1
1 parent 6a00399
commit 47a8fd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/backend/gl/gl_common.c b/src/backend/gl/gl_common.c
@@ -540,8 +540,8 @@ static int gl_lower_blit_args(struct gl_data *gd, ivec2 origin, struct backend_b
 	ivec2 mask_origin = args->mask->origin;
 	*coord = ccalloc(nrects * 16, GLfloat);
 	*indices = ccalloc(nrects * 6, GLuint);
-	gl_mask_rects_to_coords(origin, mask_origin, nrects, rects, args->scale_x,
-	                        args->scale_y, *coord, *indices);
+	gl_mask_rects_to_coords(origin, mask_origin, nrects, rects, args->scale.x,
+	                        args->scale.y, *coord, *indices);
 	if (!img->y_inverted) {
 		gl_y_flip_texture(nrects, *coord, img->height);
 	}
@@ -561,7 +561,7 @@ static int gl_lower_blit_args(struct gl_data *gd, ivec2 origin, struct backend_b
 		border_width = 0;
 	}
 	// clang-format off
-	auto tex_sampler = args->scale_x == 1.0 && args->scale_y == 1.0 ?
+	auto tex_sampler = vec2_eq(args->scale, SCALE_IDENTITY) ?
 	    gd->samplers[GL_SAMPLER_REPEAT] : gd->samplers[GL_SAMPLER_REPEAT_SCALE];
 	struct gl_uniform_value from_uniforms[] = {
 	    [UNIFORM_OPACITY_LOC]        = {.type = GL_FLOAT, .f = (float)args->opacity},

diff --git a/src/types.h b/src/types.h
@@ -78,5 +78,9 @@ static inline ivec2 ivec2_neg(ivec2 a) {
 	};
 }
 
+static inline bool vec2_eq(vec2 a, vec2 b) {
+	return a.x == b.x && a.y == b.y;
+}
+
 #define MARGIN_INIT                                                                      \
 	{ 0, 0, 0, 0 }