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

Unified Diff: content/browser/gpu/browser_gpu_memory_buffer_manager.cc

Issue 1422103003: cc: Remove the ability to specify a GL texture target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« cc/resources/resource_pool.h ('K') | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/browser_gpu_memory_buffer_manager.cc
diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
index 5764281070930b188c84e3a4e4d8379dc1812b4b..755e86aa8e27157da941c04d39c0d39c01ed1ee4 100644
--- a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
+++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
@@ -229,7 +229,7 @@ uint32 BrowserGpuMemoryBufferManager::GetImageTextureTarget(
GetNativeGpuMemoryBufferConfigurations();
if (native_configurations.find(std::make_pair(format, usage)) ==
native_configurations.end()) {
- return GL_TEXTURE_2D;
+ return 0;
reveman 2015/10/29 14:11:39 I don't think this is correct. This is supposed to
ccameron 2015/10/29 19:08:29 Yeah, this was a bad idea and I should have left i
}
switch (GpuMemoryBufferFactory::GetNativeType()) {
@@ -242,14 +242,14 @@ uint32 BrowserGpuMemoryBufferManager::GetImageTextureTarget(
// IOSurface backed images require GL_TEXTURE_RECTANGLE_ARB.
return GL_TEXTURE_RECTANGLE_ARB;
case gfx::SHARED_MEMORY_BUFFER:
- return GL_TEXTURE_2D;
+ return 0;
reveman 2015/10/29 14:11:39 This could be a NOTREACHED case now that the shm f
case gfx::EMPTY_BUFFER:
NOTREACHED();
- return GL_TEXTURE_2D;
+ return 0;
}
NOTREACHED();
- return GL_TEXTURE_2D;
+ return 0;
}
scoped_ptr<gfx::GpuMemoryBuffer>
« cc/resources/resource_pool.h ('K') | « cc/trees/layer_tree_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698