From c8a2f0b2485976dfe134869e089d314d14d09293 Mon Sep 17 00:00:00 2001
From: David Rosca <david.rosca@amd.com>
Date: Mon, 17 Mar 2025 10:31:19 +0100
Subject: [PATCH] gallium/vl: Fix rotation with scaling for compute shaders

Cc: mesa-stable
Acked-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34140>
---
 src/gallium/auxiliary/vl/vl_compositor_cs.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/gallium/auxiliary/vl/vl_compositor_cs.c b/src/gallium/auxiliary/vl/vl_compositor_cs.c
index fda3c47e8b4..4bd5b1dfbf0 100644
--- a/src/gallium/auxiliary/vl/vl_compositor_cs.c
+++ b/src/gallium/auxiliary/vl/vl_compositor_cs.c
@@ -674,8 +674,6 @@ calc_proj(struct vl_compositor_layer *layer,
    float ratio_y = (float)texture->height0 / layer->sampler_views[0]->texture->height0;
    float width = layer->sampler_views[0]->texture->width0;
    float height = layer->sampler_views[0]->texture->height0;
-   float translate_x = texture->width0 * ratio_x;
-   float translate_y = texture->height0 * ratio_y;
 
    memset(m, 0, sizeof(float) * 2 * 4);
 
@@ -688,7 +686,7 @@ calc_proj(struct vl_compositor_layer *layer,
    case VL_COMPOSITOR_ROTATE_90:
       m[0][1] = 1.0;
       m[1][0] = -1.0;
-      m[1][2] = translate_y;
+      m[1][2] = texture->height0;
       width = layer->sampler_views[0]->texture->height0;
       height = layer->sampler_views[0]->texture->width0;
       break;
@@ -703,7 +701,7 @@ calc_proj(struct vl_compositor_layer *layer,
    case VL_COMPOSITOR_ROTATE_270:
       m[0][1] = -1.0;
       m[1][0] = 1.0;
-      m[0][2] = translate_x;
+      m[0][2] = texture->width0;
       width = layer->sampler_views[0]->texture->height0;
       height = layer->sampler_views[0]->texture->width0;
       break;
@@ -716,12 +714,12 @@ calc_proj(struct vl_compositor_layer *layer,
    case VL_COMPOSITOR_MIRROR_HORIZONTAL:
       m[0][0] *= -1;
       m[0][1] *= -1;
-      m[0][2] = translate_x - m[0][2];
+      m[0][2] = texture->width0 - m[0][2];
       break;
    case VL_COMPOSITOR_MIRROR_VERTICAL:
       m[1][0] *= -1;
       m[1][1] *= -1;
-      m[1][2] = translate_y - m[1][2];
+      m[1][2] = texture->height0 - m[1][2];
       break;
    }
 
@@ -730,10 +728,8 @@ calc_proj(struct vl_compositor_layer *layer,
 
    m[0][0] *= scale_x;
    m[0][1] *= scale_x;
-   m[0][2] *= scale_x;
    m[1][0] *= scale_y;
    m[1][1] *= scale_y;
-   m[1][2] *= scale_y;
 
    float crop_x = (layer->src.tl.x * width) * ratio_x;
    float crop_y = (layer->src.tl.y * height) * ratio_y;