Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 21:47:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] egl: properly apply xor mask to masked color cursors

Browse Source
This commit is contained in:
Geoffrey McRae 2022-01-26 12:11:43 +11:00
parent f3ebde7d9f
commit 3067bdaa15
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
client/renderers/EGL/cursor.c
View File

@ -260,11 +260,25 @@ struct CursorState egl_cursorRender(EGL_Cursor * cursor,
switch(cursor->type) switch(cursor->type)
{ {
case LG_CURSOR_MASKED_COLOR: case LG_CURSOR_MASKED_COLOR:
{
uint32_t xor[cursor->height][cursor->width];
for(int y = 0; y < cursor->height; ++y) for(int y = 0; y < cursor->height; ++y)
for(int x = 0; x < cursor->width; ++x) for(int x = 0; x < cursor->width; ++x)
{ {
uint8_t * mask = data + (cursor->stride * y) + x * 4 + 3; uint32_t * src = (uint32_t *)(data + (cursor->stride * y) + x * 4);
*mask = (*mask == 0xFF) ? 0x00 : 0xFF; const bool masked = (*src & 0xFF000000) != 0;
if (masked)
*src = xor[y][x] = *src & 0x00FFFFFF;
else
{
xor[y][x] = 0xFF000000;
*src |= 0xFF000000;
}
}
egl_textureSetup(cursor->mono.texture, EGL_PF_BGRA,
cursor->width, cursor->height, sizeof(xor[0]));
egl_textureUpdate(cursor->mono.texture, (uint8_t *)xor);
} }
// fall through // fall through
@ -273,7 +287,6 @@ struct CursorState egl_cursorRender(EGL_Cursor * cursor,
egl_textureSetup(cursor->norm.texture, EGL_PF_BGRA, egl_textureSetup(cursor->norm.texture, EGL_PF_BGRA,
cursor->width, cursor->height, cursor->stride); cursor->width, cursor->height, cursor->stride);
egl_textureUpdate(cursor->norm.texture, data); egl_textureUpdate(cursor->norm.texture, data);
egl_modelSetTexture(cursor->model, cursor->norm.texture);
break; break;
} }
@ -384,12 +397,30 @@ struct CursorState egl_cursorRender(EGL_Cursor * cursor,
} }
case LG_CURSOR_MASKED_COLOR: case LG_CURSOR_MASKED_COLOR:
{
egl_shaderUse(cursor->norm.shader);
setCursorTexUniforms(cursor, &cursor->norm, false, pos.x, pos.y,
size.w, size.h, scale);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
egl_modelSetTexture(cursor->model, cursor->norm.texture);
egl_modelRender(cursor->model);
egl_shaderUse(cursor->mono.shader);
setCursorTexUniforms(cursor, &cursor->mono, false, pos.x, pos.y,
size.w, size.h, scale);
glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);
egl_modelSetTexture(cursor->model, cursor->mono.texture);
egl_modelRender(cursor->model);
break;
}
case LG_CURSOR_COLOR: case LG_CURSOR_COLOR:
{ {
egl_shaderUse(cursor->norm.shader); egl_shaderUse(cursor->norm.shader);
setCursorTexUniforms(cursor, &cursor->norm, false, pos.x, pos.y, setCursorTexUniforms(cursor, &cursor->norm, false, pos.x, pos.y,
size.w, size.h, scale); size.w, size.h, scale);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
egl_modelSetTexture(cursor->model, cursor->norm.texture);
egl_modelRender(cursor->model); egl_modelRender(cursor->model);
break; break;
} }