From a337a97429aa2dfa2aeda159467f4c40146a6ba1 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 2 Oct 2025 16:16:41 +0200 Subject: [PATCH] gallium/vl: Remove vl_compositor_set_csc_matrix Acked-by: Ruijing Dong Part-of: --- src/gallium/auxiliary/vl/vl_compositor.c | 17 +---------------- src/gallium/auxiliary/vl/vl_compositor.h | 9 +-------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index 511bfdab50a..4ec93eb75a5 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -508,17 +508,6 @@ vl_compositor_cleanup(struct vl_compositor *c) cleanup_pipe_state(c); } -bool -vl_compositor_set_csc_matrix(struct vl_compositor_state *s, - vl_csc_matrix const *matrix) -{ - assert(s); - - memcpy(&s->csc_matrix, matrix, sizeof(vl_csc_matrix)); - - return true; -} - void vl_compositor_set_dst_clip(struct vl_compositor_state *s, struct u_rect *dst_clip) { @@ -864,8 +853,6 @@ vl_compositor_init(struct vl_compositor *c, struct pipe_context *pipe, bool comp bool vl_compositor_init_state(struct vl_compositor_state *s, struct pipe_context *pipe) { - vl_csc_matrix csc_matrix; - assert(s); memset(s, 0, sizeof(*s)); @@ -895,9 +882,7 @@ vl_compositor_init_state(struct vl_compositor_state *s, struct pipe_context *pip vl_csc_get_rgbyuv_matrix(PIPE_VIDEO_VPP_MCF_BT709, PIPE_FORMAT_NV12, PIPE_FORMAT_B8G8R8A8_UNORM, PIPE_VIDEO_VPP_CHROMA_COLOR_RANGE_REDUCED, PIPE_VIDEO_VPP_CHROMA_COLOR_RANGE_FULL, - &csc_matrix); - if (!vl_compositor_set_csc_matrix(s, (const vl_csc_matrix *)&csc_matrix)) - return false; + &s->csc_matrix); return true; } diff --git a/src/gallium/auxiliary/vl/vl_compositor.h b/src/gallium/auxiliary/vl/vl_compositor.h index ff0f6713b0a..ecd8ea92681 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.h +++ b/src/gallium/auxiliary/vl/vl_compositor.h @@ -137,7 +137,7 @@ struct vl_compositor_state vl_csc_matrix rgb2yuv; vl_csc_matrix primaries; - vl_csc_matrix csc_matrix; + vl_csc_matrix csc_matrix; /* gfx compositor only */ }; struct vl_compositor @@ -223,13 +223,6 @@ vl_compositor_init(struct vl_compositor *compositor, struct pipe_context *pipe, bool vl_compositor_init_state(struct vl_compositor_state *state, struct pipe_context *pipe); -/** - * set yuv -> rgba conversion matrix - */ -bool -vl_compositor_set_csc_matrix(struct vl_compositor_state *settings, - const vl_csc_matrix *matrix); - /** * reset dirty area, so it's cleared with the clear colour */