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

[client] define locking types and semantics to allow for alt methods

Browse source
This commit is contained in:
Geoffrey McRae 2017-12-21 00:57:27 +11:00
parent 2fe800f502
commit 2f6b7e08f8
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
client/renderers/opengl.c
View file

@ -71,7 +71,7 @@ struct Inst
bool resizeWindow; bool resizeWindow;
bool frameUpdate; bool frameUpdate;
volatile int formatLock; LG_Lock formatLock;
LG_RendererFormat format; LG_RendererFormat format;
GLuint intFormat; GLuint intFormat;
GLuint vboFormat; GLuint vboFormat;
@ -81,7 +81,7 @@ struct Inst
bool hasBuffers; bool hasBuffers;
GLuint vboID[1]; GLuint vboID[1];
uint8_t * texPixels[BUFFER_COUNT]; uint8_t * texPixels[BUFFER_COUNT];
volatile int syncLock; LG_Lock syncLock;
int texIndex, wTexIndex; int texIndex, wTexIndex;
int texList; int texList;
int fpsList; int fpsList;
@ -99,7 +99,7 @@ struct Inst
uint64_t renderCount; uint64_t renderCount;
SDL_Rect fpsRect; SDL_Rect fpsRect;
volatile int mouseLock; LG_Lock mouseLock;
LG_RendererCursor mouseCursor; LG_RendererCursor mouseCursor;
int mouseWidth; int mouseWidth;
int mouseHeight; int mouseHeight;
@ -144,6 +144,10 @@ bool opengl_create(void ** opaque, const LG_RendererParams params)
memcpy(&this->params, &params , sizeof(LG_RendererParams)); memcpy(&this->params, &params , sizeof(LG_RendererParams));
memcpy(&this->opt , &defaultOptions, sizeof(struct Options )); memcpy(&this->opt , &defaultOptions, sizeof(struct Options ));
LG_LOCK_INIT(this->formatLock);
LG_LOCK_INIT(this->syncLock );
LG_LOCK_INIT(this->mouseLock );
return true; return true;
} }
@ -203,7 +207,7 @@ bool opengl_on_mouse_shape(void * opaque, const LG_RendererCursor cursor, const
if (!this) if (!this)
return false; return false;
while(__sync_lock_test_and_set(&this->mouseLock, 1)); LG_LOCK(this->mouseLock);
this->mouseCursor = cursor; this->mouseCursor = cursor;
this->mouseWidth = width; this->mouseWidth = width;
this->mouseHeight = height; this->mouseHeight = height;
@ -220,7 +224,7 @@ bool opengl_on_mouse_shape(void * opaque, const LG_RendererCursor cursor, const
memcpy(this->mouseData, data, size); memcpy(this->mouseData, data, size);
this->newShape = true; this->newShape = true;
__sync_lock_release(&this->mouseLock); LG_UNLOCK(this->mouseLock);
return true; return true;
} }
@ -250,7 +254,7 @@ bool opengl_on_frame_event(void * opaque, const LG_RendererFormat format, const
return false; return false;
} }
while(__sync_lock_test_and_set(&this->formatLock, 1)); LG_LOCK(this->formatLock);
if (this->reconfigure) if (this->reconfigure)
{ {
__sync_lock_release(&this->formatLock); __sync_lock_release(&this->formatLock);
@ -270,7 +274,7 @@ bool opengl_on_frame_event(void * opaque, const LG_RendererFormat format, const
while(__sync_lock_test_and_set(&this->syncLock, 1)); while(__sync_lock_test_and_set(&this->syncLock, 1));
memcpySSE(this->texPixels[this->wTexIndex], data, this->texSize); memcpySSE(this->texPixels[this->wTexIndex], data, this->texSize);
this->frameUpdate = true; this->frameUpdate = true;
__sync_lock_release(&this->syncLock); LG_UNLOCK(this->syncLock);
++this->frameCount; ++this->frameCount;
return true; return true;
@ -430,7 +434,7 @@ static bool _check_gl_error(unsigned int line, const char * name)
static bool configure(struct Inst * this, SDL_Window *window) static bool configure(struct Inst * this, SDL_Window *window)
{ {
while(__sync_lock_test_and_set(&this->formatLock, 1)); LG_LOCK(this->formatLock);
if (!this->reconfigure) if (!this->reconfigure)
{ {
__sync_lock_release(&this->formatLock); __sync_lock_release(&this->formatLock);
@ -787,7 +791,7 @@ static bool draw_frame(struct Inst * this, bool * frameUpdate)
*frameUpdate = this->frameUpdate; *frameUpdate = this->frameUpdate;
if (!this->frameUpdate) if (!this->frameUpdate)
{ {
__sync_lock_release(&this->syncLock); LG_UNLOCK(this->syncLock);
return true; return true;
} }
@ -795,9 +799,9 @@ static bool draw_frame(struct Inst * this, bool * frameUpdate)
if (++this->wTexIndex == BUFFER_COUNT) if (++this->wTexIndex == BUFFER_COUNT)
this->wTexIndex = 0; this->wTexIndex = 0;
this->frameUpdate = false; this->frameUpdate = false;
__sync_lock_release(&this->syncLock); LG_UNLOCK(this->syncLock);
while(__sync_lock_test_and_set(&this->formatLock, 1)); LG_LOCK(this->formatLock);
if (this->params.showFPS && this->renderTime > 1e9) if (this->params.showFPS && this->renderTime > 1e9)
{ {
char str[128]; char str[128];

5
client/utils.h
View file

@ -45,3 +45,8 @@ static inline void nsleep(uint64_t ns)
}; };
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
} }
typedef volatile int LG_Lock;
#define LG_LOCK_INIT(x) (x) = 0
#define LG_LOCK(x) while(__sync_lock_test_and_set(&(x), 1))
#define LG_UNLOCK(x) __sync_lock_release(&this->mouseLock)