mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-22 22:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] opengl: do not render a sync pending texture

Browse source
This commit is contained in:
Geoffrey McRae 2021-07-02 21:48:31 +10:00
parent 203ebc73eb
commit 7b95cc72ed
1 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
client/renderers/OpenGL/opengl.c
View file

@ -126,7 +126,7 @@ struct Inst
struct IntPoint window; struct IntPoint window;
float uiScale; float uiScale;
bool frameUpdate; _Atomic(bool) frameUpdate;
const LG_Font * font; const LG_Font * font;
LG_FontObj fontObj, alertFontObj; LG_FontObj fontObj, alertFontObj;
@ -144,9 +144,9 @@ struct Inst
bool hasBuffers; bool hasBuffers;
GLuint vboID[BUFFER_COUNT]; GLuint vboID[BUFFER_COUNT];
uint8_t * texPixels[BUFFER_COUNT]; uint8_t * texPixels[BUFFER_COUNT];
LG_Lock syncLock; LG_Lock frameLock;
bool texReady; bool texReady;
int texIndex; int texWIndex, texRIndex;
int texList; int texList;
int fpsList; int fpsList;
int mouseList; int mouseList;
@ -231,7 +231,7 @@ bool opengl_create(void ** opaque, const LG_RendererParams params,
LG_LOCK_INIT(this->formatLock); LG_LOCK_INIT(this->formatLock);
LG_LOCK_INIT(this->syncLock ); LG_LOCK_INIT(this->frameLock );
LG_LOCK_INIT(this->mouseLock ); LG_LOCK_INIT(this->mouseLock );
this->font = LG_Fonts[0]; this->font = LG_Fonts[0];
@ -296,7 +296,7 @@ void opengl_deinitialize(void * opaque)
} }
LG_LOCK_FREE(this->formatLock); LG_LOCK_FREE(this->formatLock);
LG_LOCK_FREE(this->syncLock ); LG_LOCK_FREE(this->frameLock );
LG_LOCK_FREE(this->mouseLock ); LG_LOCK_FREE(this->mouseLock );
struct Alert * alert; struct Alert * alert;
@ -418,10 +418,10 @@ bool opengl_on_frame(void * opaque, const FrameBuffer * frame, int dmaFd)
{ {
struct Inst * this = (struct Inst *)opaque; struct Inst * this = (struct Inst *)opaque;
LG_LOCK(this->syncLock); LG_LOCK(this->frameLock);
this->frame = frame; this->frame = frame;
this->frameUpdate = true; atomic_store_explicit(&this->frameUpdate, true, memory_order_release);
LG_UNLOCK(this->syncLock); LG_UNLOCK(this->frameLock);
if (this->waiting) if (this->waiting)
{ {
@ -612,7 +612,7 @@ bool opengl_render(void * opaque, LG_RendererRotate rotate)
{ {
bool newShape; bool newShape;
update_mouse_shape(this, &newShape); update_mouse_shape(this, &newShape);
glCallList(this->texList + this->texIndex); glCallList(this->texList + this->texRIndex);
draw_mouse(this); draw_mouse(this);
if (!this->waitDone) if (!this->waitDone)
@ -1294,23 +1294,9 @@ static bool opengl_buffer_fn(void * opaque, const void * data, size_t size)
static bool draw_frame(struct Inst * this) static bool draw_frame(struct Inst * this)
{ {
LG_LOCK(this->syncLock); if (glIsSync(this->fences[this->texWIndex]))
if (!this->frameUpdate)
{ {
LG_UNLOCK(this->syncLock); switch(glClientWaitSync(this->fences[this->texWIndex], 0, GL_TIMEOUT_IGNORED))
return true;
}
if (++this->texIndex == BUFFER_COUNT)
this->texIndex = 0;
this->frameUpdate = false;
LG_UNLOCK(this->syncLock);
LG_LOCK(this->formatLock);
if (glIsSync(this->fences[this->texIndex]))
{
switch(glClientWaitSync(this->fences[this->texIndex], 0, GL_TIMEOUT_IGNORED))
{ {
case GL_ALREADY_SIGNALED: case GL_ALREADY_SIGNALED:
break; break;
@ -1328,12 +1314,24 @@ static bool draw_frame(struct Inst * this)
break; break;
} }
glDeleteSync(this->fences[this->texIndex]); glDeleteSync(this->fences[this->texWIndex]);
this->fences[this->texIndex] = NULL; this->fences[this->texWIndex] = NULL;
this->texRIndex = this->texWIndex;
if (++this->texWIndex == BUFFER_COUNT)
this->texWIndex = 0;
} }
glBindTexture(GL_TEXTURE_2D, this->frames[this->texIndex]); LG_LOCK(this->frameLock);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, this->vboID[this->texIndex]); if (!atomic_exchange_explicit(&this->frameUpdate, false, memory_order_acquire))
{
LG_UNLOCK(this->frameLock);
return true;
}
LG_LOCK(this->formatLock);
glBindTexture(GL_TEXTURE_2D, this->frames[this->texWIndex]);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, this->vboID[this->texWIndex]);
const int bpp = this->format.bpp / 8; const int bpp = this->format.bpp / 8;
glPixelStorei(GL_UNPACK_ALIGNMENT , bpp); glPixelStorei(GL_UNPACK_ALIGNMENT , bpp);
@ -1351,6 +1349,8 @@ static bool draw_frame(struct Inst * this)
this this
); );
LG_UNLOCK(this->frameLock);
// update the texture // update the texture
glTexSubImage2D( glTexSubImage2D(
GL_TEXTURE_2D, GL_TEXTURE_2D,
@ -1365,15 +1365,11 @@ static bool draw_frame(struct Inst * this)
); );
if (check_gl_error("glTexSubImage2D")) if (check_gl_error("glTexSubImage2D"))
{ {
DEBUG_ERROR("texIndex: %u, width: %u, height: %u, vboFormat: %x, texSize: %lu", DEBUG_ERROR("texWIndex: %u, width: %u, height: %u, vboFormat: %x, texSize: %lu",
this->texIndex, this->format.width, this->format.height, this->vboFormat, this->texSize this->texWIndex, this->format.width, this->format.height, this->vboFormat, this->texSize
); );
} }
// set a fence so we don't overwrite a buffer in use
this->fences[this->texIndex] =
glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
// unbind the buffer // unbind the buffer
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
@ -1394,6 +1390,11 @@ static bool draw_frame(struct Inst * this)
} }
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
// set a fence so we don't overwrite a buffer in use
this->fences[this->texWIndex] =
glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
glFlush();
LG_UNLOCK(this->formatLock); LG_UNLOCK(this->formatLock);
this->texReady = true; this->texReady = true;
return true; return true;