Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc

Issue 2805010: Fix argument to glTexEnvi in accelerated Mac surface (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc
diff --git a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc
index 716c049584b81f6ac97a5dc032912806a9b769d5..c8be132bbca21db3fc28ffa21659897741a765d3 100644
--- a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc
+++ b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc
@@ -83,8 +83,7 @@ void AcceleratedSurfaceContainerManagerMac::Draw(CGLContextObj context) {
glDisable(GL_DEPTH_TEST);
glDisable(GL_BLEND);
- GLenum target = GL_TEXTURE_RECTANGLE_ARB;
- glTexEnvi(target, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
for (PluginWindowToContainerMap::const_iterator i =
plugin_window_to_container_map_.begin();
@@ -96,6 +95,7 @@ void AcceleratedSurfaceContainerManagerMac::Draw(CGLContextObj context) {
// Unbind any texture from the texture target to ensure that the
// next time through we will have to re-bind the texture and thereby
// pick up modifications from the other process.
+ GLenum target = GL_TEXTURE_RECTANGLE_ARB;
glBindTexture(target, 0);
glFlush();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698