Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 05:53:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] egl: eliminate GLsync object leaks

Browse Source 
It used to be the case that we overwrite this->sync even if it was non-zero
when updating the texture, without deleting the sync object. If we update
faster than we render, the result would be leaking sync objects.

This commit ensures that sync objects are deleted when they are replaced.
This commit is contained in:
Quantum 2021-08-07 19:04:49 -04:00 committed by Geoffrey McRae
parent 16f68d6b1b
commit b3db1ba10b
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/renderers/EGL/texture_buffer.c
View File

@ -68,6 +68,7 @@ bool eglTexBuffer_init(EGL_Texture ** texture, EGLDisplay * display)
this = UPCAST(TextureBuffer, *texture); this = UPCAST(TextureBuffer, *texture);
this->texCount = 1; this->texCount = 1;
atomic_init(&this->sync, 0);
return true; return true;
} }
@ -226,7 +227,8 @@ EGL_TexStatus eglTexBuffer_stream_process(EGL_Texture * texture)
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
this->sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
glDeleteSync(atomic_exchange(&this->sync, sync));
glFlush(); glFlush();
} }
@ -240,14 +242,14 @@ EGL_TexStatus eglTexBuffer_stream_bind(EGL_Texture * texture)
if (this->rIndex == -1) if (this->rIndex == -1)
return EGL_TEX_STATUS_NOTREADY; return EGL_TEX_STATUS_NOTREADY;
if (this->sync) GLsync sync = atomic_exchange(&this->sync, 0);
if (sync)
{ {
switch(glClientWaitSync(this->sync, 0, 20000000)) // 20ms switch(glClientWaitSync(sync, 0, 20000000)) // 20ms
{ {
case GL_ALREADY_SIGNALED: case GL_ALREADY_SIGNALED:
case GL_CONDITION_SATISFIED: case GL_CONDITION_SATISFIED:
glDeleteSync(this->sync); glDeleteSync(sync);
this->sync = 0;
break; break;
case GL_TIMEOUT_EXPIRED: case GL_TIMEOUT_EXPIRED:
@ -255,8 +257,7 @@ EGL_TexStatus eglTexBuffer_stream_bind(EGL_Texture * texture)
case GL_WAIT_FAILED: case GL_WAIT_FAILED:
case GL_INVALID_VALUE: case GL_INVALID_VALUE:
glDeleteSync(this->sync); glDeleteSync(sync);
this->sync = 0;
DEBUG_GL_ERROR("glClientWaitSync failed"); DEBUG_GL_ERROR("glClientWaitSync failed");
return EGL_TEX_STATUS_ERROR; return EGL_TEX_STATUS_ERROR;
} }

20
client/renderers/EGL/texture_buffer.h
View File

@ -31,16 +31,16 @@ typedef struct TextureBuffer
EGL_Texture base; EGL_Texture base;
bool free; bool free;
EGL_TexFormat format; EGL_TexFormat format;
int texCount; int texCount;
GLuint tex[EGL_TEX_BUFFER_MAX]; GLuint tex[EGL_TEX_BUFFER_MAX];
GLuint sampler; GLuint sampler;
EGL_TexBuffer buf[EGL_TEX_BUFFER_MAX]; EGL_TexBuffer buf[EGL_TEX_BUFFER_MAX];
int bufFree; int bufFree;
GLsync sync; _Atomic(GLsync) sync;
LG_Lock copyLock; LG_Lock copyLock;
int bufIndex; int bufIndex;
int rIndex; int rIndex;
} }
TextureBuffer; TextureBuffer;