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

[client] egl: fix race condition in help overlay

Browse Source 
egl_help_set_text and egl_help_render were both accessing bmp->help from
different threads. This creates a race condition in which if the help text
is quickly toggled on and off, it stays on.

This has been fixed with an atomic exchange.
This commit is contained in:
Quantum 2021-01-31 17:23:22 -05:00 committed by Geoffrey McRae
parent 1d99c821eb
commit b45f7a6733
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
client/renderers/EGL/help.c
View File

@ -24,6 +24,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "shader.h" #include "shader.h"
#include "model.h" #include "model.h"
#include <stdatomic.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -37,11 +38,12 @@ struct EGL_Help
const LG_Font * font; const LG_Font * font;
LG_FontObj fontObj; LG_FontObj fontObj;
EGL_Texture * texture; EGL_Texture * texture;
EGL_Shader * shader; EGL_Shader * shader;
EGL_Shader * shaderBG; EGL_Shader * shaderBG;
EGL_Model * model; EGL_Model * model;
LG_FontBitmap * bmp;
_Atomic(LG_FontBitmap *) bmp;
bool shouldRender; bool shouldRender;
int iwidth, iheight; int iwidth, iheight;
@ -101,7 +103,6 @@ bool egl_help_init(EGL_Help ** help, const LG_Font * font, LG_FontObj fontObj)
return false; return false;
} }
(*help)->uSize = egl_shader_get_uniform_location((*help)->shader , "size" ); (*help)->uSize = egl_shader_get_uniform_location((*help)->shader , "size" );
(*help)->uScreen = egl_shader_get_uniform_location((*help)->shader , "screen"); (*help)->uScreen = egl_shader_get_uniform_location((*help)->shader , "screen");
(*help)->uSizeBG = egl_shader_get_uniform_location((*help)->shaderBG, "size" ); (*help)->uSizeBG = egl_shader_get_uniform_location((*help)->shaderBG, "size" );
@ -116,6 +117,8 @@ bool egl_help_init(EGL_Help ** help, const LG_Font * font, LG_FontObj fontObj)
egl_model_set_default((*help)->model); egl_model_set_default((*help)->model);
egl_model_set_texture((*help)->model, (*help)->texture); egl_model_set_texture((*help)->model, (*help)->texture);
atomic_init(&(*help)->bmp, NULL);
return true; return true;
} }
@ -135,37 +138,40 @@ void egl_help_free(EGL_Help ** help)
void egl_help_set_text(EGL_Help * help, const char * help_text) void egl_help_set_text(EGL_Help * help, const char * help_text)
{ {
if (!help_text) LG_FontBitmap * bmp = NULL;
if (help_text)
{ {
bmp = help->font->render(help->fontObj, 0xffffff00, help_text);
if (!bmp)
DEBUG_ERROR("Failed to render help text");
} else
help->shouldRender = false; help->shouldRender = false;
return;
}
help->bmp = help->font->render(help->fontObj, 0xffffff00, help_text); bmp = atomic_exchange(&help->bmp, bmp);
if (!help->bmp) if (bmp)
{ {
DEBUG_ERROR("Failed to render help text"); help->font->release(help->fontObj, bmp);
return;
} }
} }
void egl_help_render(EGL_Help * help, const float scaleX, const float scaleY) void egl_help_render(EGL_Help * help, const float scaleX, const float scaleY)
{ {
if (help->bmp) LG_FontBitmap * bmp = atomic_exchange(&help->bmp, NULL);
if (bmp)
{ {
if (help->iwidth != help->bmp->width || help->iheight != help->bmp->height) if (help->iwidth != bmp->width || help->iheight != bmp->height)
{ {
help->iwidth = help->bmp->width; help->iwidth = bmp->width;
help->iheight = help->bmp->height; help->iheight = bmp->height;
help->width = (float)help->bmp->width; help->width = (float)bmp->width;
help->height = (float)help->bmp->height; help->height = (float)bmp->height;
egl_texture_setup( egl_texture_setup(
help->texture, help->texture,
EGL_PF_BGRA, EGL_PF_BGRA,
help->bmp->width , bmp->width ,
help->bmp->height, bmp->height,
help->bmp->width * help->bmp->bpp, bmp->width * bmp->bpp,
false, false,
false false
); );
@ -174,12 +180,11 @@ void egl_help_render(EGL_Help * help, const float scaleX, const float scaleY)
egl_texture_update egl_texture_update
( (
help->texture, help->texture,
help->bmp->pixels bmp->pixels
); );
help->shouldRender = true; help->shouldRender = true;
help->font->release(help->fontObj, help->bmp); help->font->release(help->fontObj, bmp);
help->bmp = NULL;
} }
if (!help->shouldRender) if (!help->shouldRender)