Skip to content

Commit

Permalink
we have to use glEnable with GL_BLEND, glEnablei doesn't make sense
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@23263 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jul 22, 2019
1 parent 7d35a63 commit 6576d79
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/xpra/client/gl/gl_window_backing_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
glActiveTexture, glTexSubImage2D,
glGetString, glViewport, glMatrixMode, glLoadIdentity, glOrtho,
glGenTextures, glDisable,
glBindTexture, glPixelStorei, glEnable, glEnablei, glBegin, glFlush,
glBindTexture, glPixelStorei, glEnable, glBegin, glFlush,
glTexParameteri,
glTexImage2D,
glMultiTexCoord2i,
Expand Down Expand Up @@ -650,7 +650,7 @@ def do_present_fbo(self):
glBindTexture(target, self.textures[TEX_FBO])
if self._alpha_enabled:
# support alpha channel if present:
glEnablei(GL_BLEND, self.textures[TEX_FBO])
glEnable(GL_BLEND)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE)
glBegin(GL_QUADS)
Expand Down Expand Up @@ -758,7 +758,7 @@ def draw_pointer(self):
target = GL_TEXTURE_RECTANGLE_ARB
glEnable(target)
glBindTexture(target, self.textures[TEX_CURSOR])
glEnablei(GL_BLEND, self.textures[TEX_CURSOR])
glEnable(GL_BLEND)
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA)
glBlendFunc(GL_ONE, GL_ONE)
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE)
Expand Down

0 comments on commit 6576d79

Please sign in to comment.