AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/vl: Fix rotation with scaling for compute shaders

Browse Source 
Cc: mesa-stable
Acked-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34140>
This commit is contained in:
David Rosca
2025-03-17 10:31:19 +01:00
committed by Marge Bot
parent 2034c901cc
commit c8a2f0b248
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/vl/vl_compositor_cs.c
+4 -8
View File
@@ -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;