mirror of
https://github.com/gnif/LookingGlass.git
synced 2024-11-10 08:38:20 +00:00
[client] egl: revert glsync changes
`process` and `bind` are called from the same thread in order, there is no need for atomic usage here. This reverts commit3d7dbd6371
. This reverts commitb3db1ba10b
.
This commit is contained in:
parent
e949f2f8d2
commit
037b76750a
@ -41,9 +41,11 @@ static void eglTexBuffer_cleanup(TextureBuffer * this)
|
||||
if (this->sampler)
|
||||
glDeleteSamplers(1, &this->sampler);
|
||||
|
||||
GLsync sync = atomic_exchange(&this->sync, 0);
|
||||
if (sync)
|
||||
glDeleteSync(sync);
|
||||
if (this->sync)
|
||||
{
|
||||
glDeleteSync(this->sync);
|
||||
this->sync = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// common functions
|
||||
@ -66,7 +68,6 @@ bool eglTexBuffer_init(EGL_Texture ** texture, EGLDisplay * display)
|
||||
this = UPCAST(TextureBuffer, *texture);
|
||||
|
||||
this->texCount = 1;
|
||||
atomic_init(&this->sync, 0);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -199,7 +200,7 @@ EGL_TexStatus eglTexBuffer_stream_process(EGL_Texture * texture)
|
||||
GLuint tex = this->tex[this->bufIndex];
|
||||
EGL_TexBuffer * buffer = &this->buf[this->bufIndex];
|
||||
|
||||
if (buffer->updated && atomic_load(&this->sync) == 0)
|
||||
if (buffer->updated && this->sync == 0)
|
||||
{
|
||||
this->rIndex = this->bufIndex;
|
||||
if (++this->bufIndex == this->texCount)
|
||||
@ -225,8 +226,7 @@ EGL_TexStatus eglTexBuffer_stream_process(EGL_Texture * texture)
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
|
||||
|
||||
GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
|
||||
glDeleteSync(atomic_exchange(&this->sync, sync));
|
||||
this->sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
|
||||
glFlush();
|
||||
}
|
||||
|
||||
@ -240,14 +240,14 @@ EGL_TexStatus eglTexBuffer_stream_bind(EGL_Texture * texture)
|
||||
if (this->rIndex == -1)
|
||||
return EGL_TEX_STATUS_NOTREADY;
|
||||
|
||||
GLsync sync = atomic_exchange(&this->sync, 0);
|
||||
if (sync)
|
||||
if (this->sync)
|
||||
{
|
||||
switch(glClientWaitSync(sync, 0, 20000000)) // 20ms
|
||||
switch(glClientWaitSync(this->sync, 0, 20000000)) // 20ms
|
||||
{
|
||||
case GL_ALREADY_SIGNALED:
|
||||
case GL_CONDITION_SATISFIED:
|
||||
glDeleteSync(sync);
|
||||
glDeleteSync(this->sync);
|
||||
this->sync = 0;
|
||||
break;
|
||||
|
||||
case GL_TIMEOUT_EXPIRED:
|
||||
@ -255,7 +255,8 @@ EGL_TexStatus eglTexBuffer_stream_bind(EGL_Texture * texture)
|
||||
|
||||
case GL_WAIT_FAILED:
|
||||
case GL_INVALID_VALUE:
|
||||
glDeleteSync(sync);
|
||||
glDeleteSync(this->sync);
|
||||
this->sync = 0;
|
||||
DEBUG_GL_ERROR("glClientWaitSync failed");
|
||||
return EGL_TEX_STATUS_ERROR;
|
||||
}
|
||||
|
@ -31,16 +31,16 @@ typedef struct TextureBuffer
|
||||
EGL_Texture base;
|
||||
bool free;
|
||||
|
||||
EGL_TexFormat format;
|
||||
int texCount;
|
||||
GLuint tex[EGL_TEX_BUFFER_MAX];
|
||||
GLuint sampler;
|
||||
EGL_TexBuffer buf[EGL_TEX_BUFFER_MAX];
|
||||
int bufFree;
|
||||
_Atomic(GLsync) sync;
|
||||
LG_Lock copyLock;
|
||||
int bufIndex;
|
||||
int rIndex;
|
||||
EGL_TexFormat format;
|
||||
int texCount;
|
||||
GLuint tex[EGL_TEX_BUFFER_MAX];
|
||||
GLuint sampler;
|
||||
EGL_TexBuffer buf[EGL_TEX_BUFFER_MAX];
|
||||
int bufFree;
|
||||
GLsync sync;
|
||||
LG_Lock copyLock;
|
||||
int bufIndex;
|
||||
int rIndex;
|
||||
}
|
||||
TextureBuffer;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user