Changeset 139182 in webkit

Timestamp:

Jan 9, 2013 3:25:12 AM (11 years ago)

Author:

zeno.albisser@digia.com

Message:

[Qt][Mac] GraphicsSurface does not need glEnable/glDisable for texture targets.
​https://bugs.webkit.org/show_bug.cgi?id=106310

glEnable/glDisable for texture targets is only necessary
when using the fixed function pipeline.
Enabling or disabling the target might cause unexpected
behavior to texture bindings and is therefore considered harmful.

Reviewed by Noam Rosenthal.

• platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp:

(WebCore::createTexture):
(WebCore::GraphicsSurfacePrivate::copyFromTexture):
(WebCore::GraphicsSurface::platformCopyToGLTexture):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-09  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt][Mac] GraphicsSurface does not need glEnable/glDisable for texture targets.
+        https://bugs.webkit.org/show_bug.cgi?id=106310
+
+        glEnable/glDisable for texture targets is only necessary
+        when using the fixed function pipeline.
+        Enabling or disabling the target might cause unexpected
+        behavior to texture bindings and is therefore considered harmful.
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp:
+        (WebCore::createTexture):
+        (WebCore::GraphicsSurfacePrivate::copyFromTexture):
+        (WebCore::GraphicsSurface::platformCopyToGLTexture):
+
 2013-01-09  Kunihiko Sakamoto  <ksakamoto@chromium.org>
 

trunk/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp

@@ -51 +51 @@
 
     GLint prevTexture;
-    GLboolean wasEnabled = glIsEnabled(GL_TEXTURE_RECTANGLE_ARB);
     glGetIntegerv(GL_TEXTURE_RECTANGLE_ARB, &prevTexture);
-    if (!wasEnabled)
-        glEnable(GL_TEXTURE_RECTANGLE_ARB);
 
     glGenTextures(1, &texture);
@@ -65 +62 @@
 
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, prevTexture);
-    if (!wasEnabled)
-        glDisable(GL_TEXTURE_RECTANGLE_ARB);
 
     return texture;
@@ -217 +212 @@
 
         makeCurrent();
-        glEnable(GL_TEXTURE_RECTANGLE_ARB);
 
         int x = sourceRect.x();
@@ -320 +314 @@
         glGenFramebuffers(1, &m_fbo);
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
-    glEnable(GL_TEXTURE_RECTANGLE_ARB);
-    glEnable(target);
     glBindTexture(target, id);
     glBindFramebuffer(GL_READ_FRAMEBUFFER, m_fbo);