Skip to content

Commit

Permalink
#640: disable opengl by default when running on python3, at least unt…
Browse files Browse the repository at this point in the history
…il we can fix this mess

git-svn-id: https://xpra.org/svn/Xpra/trunk@9041 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 17, 2015
1 parent bd52ad0 commit 619fb4a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/xpra/client/gl/gl_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,11 @@ def redirect_log(logger_name):
log.warn("Warning: %s '%s' is blacklisted!", *blacklisted)
else:
gl_check_error("%s '%s' is blacklisted!" % (blacklisted))
props["safe"] = bool(whitelisted) or not (bool(greylisted) or bool(blacklisted))
safe = bool(whitelisted) or not (bool(greylisted) or bool(blacklisted))
if safe and sys.version_info[0]>2:
log.warn("Warning: OpenGL python3 support is not enabled by default")
safe = False
props["safe"] = safe

#check for specific functions we need:
from OpenGL.GL import glActiveTexture, glTexSubImage2D, glTexCoord2i, \
Expand Down

0 comments on commit 619fb4a

Please sign in to comment.