Skip to content

Commit

Permalink
* fix GL frame terminator debugging
Browse files Browse the repository at this point in the history
* ensure we don't try again (and log again) if GREMEDY debugging cannot be enabled

git-svn-id: https://xpra.org/svn/Xpra/trunk@3870 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 17, 2013
1 parent b98b79c commit ae6ff16
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/xpra/client/gl/gl_window_backing.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ def gl_init(self):
if not drawable:
return None
if not self.gl_setup:
#ensure python knows which scope we're talking about:
global glInitStringMarkerGREMEDY, glStringMarkerGREMEDY
global glInitFrameTerminatorGREMEDY, glFrameTerminatorGREMEDY
# Ask GL to send us all debug messages
if GL_DEBUG_OUTPUT and gl_debug_callback and glInitDebugKHR() == True:
glEnable(GL_DEBUG_OUTPUT)
Expand All @@ -148,9 +151,15 @@ def gl_init(self):
else:
# General case - running without debugger, extension not available
glStringMarkerGREMEDY = None
#don't bother trying again for another window:
glInitStringMarkerGREMEDY = None
# Initialize frame_terminator GL debugging extension if available
if glInitFrameTerminatorGREMEDY and glInitFrameTerminatorGREMEDY() == True:
log.info("Enabling GL frame terminator debugging.")
else:
glFrameTerminatorGREMEDY = None
#don't bother trying again for another window:
glInitFrameTerminatorGREMEDY = None



Expand Down

0 comments on commit ae6ff16

Please sign in to comment.