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

[client] egl: use glGetError and codes for errors in gl* functions

Browse Source 
We used to use DEBUG_EGL_ERROR for gl* functions, which just yields
EGL_SUCCESS even when there are errors.
This commit is contained in:
Quantum 2021-07-19 04:12:29 -04:00 committed by Geoffrey McRae
parent 0cbc529640
commit b8effaf42c
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
*/ */
#include "egldebug.h" #include "egldebug.h"
#include <GLES3/gl3.h>
#include <EGL/egl.h> #include <EGL/egl.h>
const char * egl_getErrorStr(void) const char * egl_getErrorStr(void)
@ -43,3 +44,17 @@ const char * egl_getErrorStr(void)
default : return "UNKNOWN"; default : return "UNKNOWN";
} }
} }
const char * gl_getErrorStr(void)
{
switch (glGetError())
{
case GL_NO_ERROR : return "GL_NO_ERROR";
case GL_INVALID_ENUM : return "GL_INVALID_ENUM";
case GL_INVALID_VALUE : return "GL_INVALID_VALUE";
case GL_INVALID_OPERATION : return "GL_INVALID_OPERATION";
case GL_INVALID_FRAMEBUFFER_OPERATION: return "GL_INVALID_FRAMEBUFFER_OPERATION";
case GL_OUT_OF_MEMORY : return "GL_OUT_OF_MEMORY";
default : return "UNKNOWN";
}
}

7
client/renderers/EGL/egldebug.h
View File

@ -21,9 +21,16 @@
#include "common/debug.h" #include "common/debug.h"
const char * egl_getErrorStr(void); const char * egl_getErrorStr(void);
const char * gl_getErrorStr(void);
#define DEBUG_EGL_WARN(fmt, ...) \ #define DEBUG_EGL_WARN(fmt, ...) \
DEBUG_WARN(fmt " (%s)", ##__VA_ARGS__, egl_getErrorStr()) DEBUG_WARN(fmt " (%s)", ##__VA_ARGS__, egl_getErrorStr())
#define DEBUG_EGL_ERROR(fmt, ...) \ #define DEBUG_EGL_ERROR(fmt, ...) \
DEBUG_ERROR(fmt " (%s)", ##__VA_ARGS__, egl_getErrorStr()) DEBUG_ERROR(fmt " (%s)", ##__VA_ARGS__, egl_getErrorStr())
#define DEBUG_GL_WARN(fmt, ...) \
DEBUG_WARN(fmt " (%s)", ##__VA_ARGS__, gl_getErrorStr())
#define DEBUG_GL_ERROR(fmt, ...) \
DEBUG_ERROR(fmt " (%s)", ##__VA_ARGS__, gl_getErrorStr())

8
client/renderers/EGL/texture.c
View File

@ -156,7 +156,7 @@ static bool egl_texture_map(EGL_Texture * texture, uint8_t i)
if (!texture->buf[i].map) if (!texture->buf[i].map)
{ {
DEBUG_EGL_ERROR("glMapBufferRange failed for %d of %lu bytes", i, DEBUG_GL_ERROR("glMapBufferRange failed for %d of %lu bytes", i,
texture->pboBufferSize); texture->pboBufferSize);
} }
@ -447,7 +447,7 @@ bool egl_texture_update_from_dma(EGL_Texture * texture, const FrameBuffer * fram
void * new = realloc(texture->dmaImages, newCount * sizeof *texture->dmaImages); void * new = realloc(texture->dmaImages, newCount * sizeof *texture->dmaImages);
if (!new) if (!new)
{ {
DEBUG_EGL_ERROR("Failed to allocate memory"); DEBUG_ERROR("Failed to allocate memory");
eglDestroyImage(texture->display, image); eglDestroyImage(texture->display, image);
return false; return false;
} }
@ -487,7 +487,7 @@ bool egl_texture_update_from_dma(EGL_Texture * texture, const FrameBuffer * fram
case GL_WAIT_FAILED: case GL_WAIT_FAILED:
case GL_INVALID_VALUE: case GL_INVALID_VALUE:
DEBUG_EGL_ERROR("glClientWaitSync failed"); DEBUG_GL_ERROR("glClientWaitSync failed");
} }
glDeleteSync(fence); glDeleteSync(fence);
@ -572,7 +572,7 @@ enum EGL_TexStatus egl_texture_bind(EGL_Texture * texture)
case GL_INVALID_VALUE: case GL_INVALID_VALUE:
glDeleteSync(texture->buf[b].sync); glDeleteSync(texture->buf[b].sync);
texture->buf[b].sync = 0; texture->buf[b].sync = 0;
DEBUG_EGL_ERROR("glClientWaitSync failed"); DEBUG_GL_ERROR("glClientWaitSync failed");
return EGL_TEX_STATUS_ERROR; return EGL_TEX_STATUS_ERROR;
} }
} }