mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-11 06:43:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] egl: fix mono cursor double height regression

Browse source
This commit is contained in:
Geoffrey McRae 2018-12-13 01:39:52 +11:00
parent eb1c61f335
commit b6c8d3fae5
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/renderers/egl/cursor.c
View file

@ -316,27 +316,32 @@ void egl_cursor_render(EGL_Cursor * cursor)
LG_UNLOCK(cursor->lock); LG_UNLOCK(cursor->lock);
} }
egl_shader_use(cursor->shader);
glUniform4f(cursor->uMousePos, cursor->x, cursor->y, cursor->w, cursor->h);
if (cursor->type == LG_CURSOR_MONOCHROME) if (cursor->type == LG_CURSOR_MONOCHROME)
{ {
glEnable(GL_BLEND); glEnable(GL_BLEND);
egl_shader_use(cursor->shader);
glUniform4f(cursor->uMousePos, cursor->x, cursor->y, cursor->w, cursor->h / 2);
glBlendFunc(GL_ZERO, GL_SRC_COLOR); glBlendFunc(GL_ZERO, GL_SRC_COLOR);
egl_model_set_texture(cursor->model, cursor->texture); egl_model_set_texture(cursor->model, cursor->texture);
egl_model_render(cursor->model); egl_model_render(cursor->model);
egl_shader_use(cursor->shaderMono); egl_shader_use(cursor->shaderMono);
glUniform4f(cursor->uMousePosMono, cursor->x, cursor->y, cursor->w, cursor->h); glUniform4f(cursor->uMousePosMono, cursor->x, cursor->y, cursor->w, cursor->h / 2);
glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);
egl_model_set_texture(cursor->model, cursor->textureMono); egl_model_set_texture(cursor->model, cursor->textureMono);
egl_model_render(cursor->model); egl_model_render(cursor->model);
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
else else
{ {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glUniform4f(cursor->uMousePos, cursor->x, cursor->y, cursor->w, cursor->h);
glBlendFunc(GL_ONE,GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_ONE,GL_ONE_MINUS_SRC_ALPHA);
egl_model_render(cursor->model); egl_model_render(cursor->model);
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
} }