Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-09 20:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] egl: revert "only copy damaged areas when using dmabuf"

Browse Source 
This reverts commit a14de25661.
Frame is sometimes incorrect.
This commit is contained in:
Quantum
2021-07-18 04:42:48 -04:00
committed by Geoffrey McRae
parent a14de25661
commit c6a6230a56
7 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/util.c
View File

@@ -224,12 +224,13 @@ static bool rectIntersects(const FrameDamageRect * r1, const FrameDamageRect * r
r2->y + r1->height > r2->y;
}
int util_mergeOverlappingRects(FrameDamageRect * rects, int count)
int util_mergeOverlappingRects(FrameDamageRect * out, const FrameDamageRect * rects, int count)
{
bool removed[count];
bool changed;
memset(removed, 0, sizeof(removed));
memcpy(out, rects, count * sizeof(FrameDamageRect));
do
{
@@ -237,14 +238,14 @@ int util_mergeOverlappingRects(FrameDamageRect * rects, int count)
for (int i = 0; i < count; ++i)
if (!removed[i])
for (int j = i + 1; j < count; ++j)
if (!removed[j] && rectIntersects(rects + i, rects + j))
if (!removed[j] && rectIntersects(out + i, out + j))
{
uint32_t x2 = max(rects[i].x + rects[i].width, rects[j].x + rects[j].width);
uint32_t y2 = max(rects[i].y + rects[i].height, rects[j].y + rects[j].height);
rects[i].x = min(rects[i].x, rects[j].x);
rects[i].y = min(rects[i].y, rects[j].y);
rects[i].width = x2 - rects[i].x;
rects[i].height = y2 - rects[i].y;
uint32_t x2 = max(out[i].x + out[i].width, out[j].x + out[j].width);
uint32_t y2 = max(out[i].y + out[i].height, out[j].y + out[j].height);
out[i].x = min(out[i].x, out[j].x);
out[i].y = min(out[i].y, out[j].y);
out[i].width = x2 - out[i].x;
out[i].height = y2 - out[i].y;
removed[j] = true;
changed = true;
}
@@ -254,6 +255,6 @@ int util_mergeOverlappingRects(FrameDamageRect * rects, int count)
int o = 0;
for (int i = 0; i < count; ++i)
if (!removed[i])
rects[o++] = rects[i];
out[o++] = out[i];
return o;
}