mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-14 21:17:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] egl: add low FPS warning when failing to keep up

Browse source
This commit is contained in:
Geoffrey McRae 2020-05-19 22:42:55 +10:00
parent 73ba325072
commit d899c26617
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
B1-198-g6db1d69959+1 B1-198-g73ba325072+1

30
client/renderers/EGL/texture.c
View file

@ -31,7 +31,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <SDL2/SDL_egl.h> #include <SDL2/SDL_egl.h>
#define TEXTURE_COUNT 4 #define TEXTURE_COUNT 3
struct Tex struct Tex
{ {
@ -53,7 +53,7 @@ union TexState
* s = schedule * s = schedule
* d = display * d = display
*/ */
uint8_t w, u, s, d; int8_t w, u, s, d;
}; };
}; };
@ -282,6 +282,19 @@ bool egl_texture_setup(EGL_Texture * texture, enum EGL_PixelFormat pixFmt, size_
return true; return true;
} }
static void egl_warn_slow()
{
static bool warnDone = false;
if (!warnDone)
{
warnDone = true;
DEBUG_BREAK();
DEBUG_WARN("The guest is providing updates faster then we are consuming them");
DEBUG_WARN("Please increase the client FPS to avoid frame skipping");
DEBUG_BREAK();
}
}
bool egl_texture_update(EGL_Texture * texture, const uint8_t * buffer) bool egl_texture_update(EGL_Texture * texture, const uint8_t * buffer)
{ {
if (texture->streaming) if (texture->streaming)
@ -295,7 +308,10 @@ bool egl_texture_update(EGL_Texture * texture, const uint8_t * buffer)
const uint8_t next = (s.w + 1) % TEXTURE_COUNT; const uint8_t next = (s.w + 1) % TEXTURE_COUNT;
if (next == s.u) if (next == s.u)
{
egl_warn_slow();
return true; return true;
}
memcpy(texture->tex[s.w].map, buffer, texture->pboBufferSize); memcpy(texture->tex[s.w].map, buffer, texture->pboBufferSize);
@ -331,7 +347,10 @@ bool egl_texture_update_from_frame(EGL_Texture * texture, const FrameBuffer * fr
const uint8_t next = (s.w + 1) % TEXTURE_COUNT; const uint8_t next = (s.w + 1) % TEXTURE_COUNT;
if (next == s.u) if (next == s.u)
{
egl_warn_slow();
return true; return true;
}
framebuffer_read( framebuffer_read(
frame, frame,
@ -411,7 +430,6 @@ enum EGL_TexStatus egl_texture_bind(EGL_Texture * texture)
texture->tex[s.s].sync = 0; texture->tex[s.s].sync = 0;
LG_LOCK(texture->lock); LG_LOCK(texture->lock);
texture->state.d = texture->state.s;
texture->state.s = (s.s + 1) % TEXTURE_COUNT; texture->state.s = (s.s + 1) % TEXTURE_COUNT;
LG_UNLOCK(texture->lock); LG_UNLOCK(texture->lock);
break; break;
@ -426,6 +444,12 @@ enum EGL_TexStatus egl_texture_bind(EGL_Texture * texture)
return EGL_TEX_STATUS_ERROR; return EGL_TEX_STATUS_ERROR;
} }
} }
LG_LOCK(texture->lock);
const int8_t nextd = (texture->state.d + 1) % TEXTURE_COUNT;
if (texture->state.d != texture->state.s && nextd != texture->state.s)
texture->state.d = nextd;
LG_UNLOCK(texture->lock);
} }
for(int i = 0; i < texture->planeCount; ++i) for(int i = 0; i < texture->planeCount; ++i)