diff options
author | Timothy Pearson <[email protected]> | 2014-11-12 15:01:36 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-11-12 15:01:36 -0600 |
commit | d74fed9b65e4c5e742a3fe81a05b83201ccf591a (patch) | |
tree | 679088bca9ef010b9785605cdda841b64929e69b /twin/compton-tde/opengl.h | |
parent | b0c4ab328e98e611c61ce2b34b4535e0120781bd (diff) | |
parent | 325fb4c2983cb3211138078bff9cbec749be21c8 (diff) | |
download | tdebase-d74fed9b65e4c5e742a3fe81a05b83201ccf591a.tar.gz tdebase-d74fed9b65e4c5e742a3fe81a05b83201ccf591a.zip |
Merge remote-tracking branch 'compton-update/master'
Conflicts:
twin/compton-tde/common.h
twin/compton-tde/compton.c
twin/compton-tde/opengl.c
Diffstat (limited to 'twin/compton-tde/opengl.h')
-rw-r--r-- | twin/compton-tde/opengl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/compton-tde/opengl.h b/twin/compton-tde/opengl.h index 8628e36d3..b4e04440a 100644 --- a/twin/compton-tde/opengl.h +++ b/twin/compton-tde/opengl.h @@ -41,10 +41,10 @@ glx_dump_err_str(GLenum err) { */ static inline void glx_check_err_(session_t *ps, const char *func, int line) { - if (!ps->glx_context) return; + if (!ps->psglx->context) return; GLenum err = GL_NO_ERROR; - + while (GL_NO_ERROR != (err = glGetError())) { print_timestamp(ps); printf("%s():%d: GLX error ", func, line); |