Index: cc/trees/layer_tree_host_impl.cc |
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
index 1096262799da641c965a57611ec2f6adcd075abe..e19c9a2cc5bf2c2fdde4bb44e97cf1a693b11358 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -2010,16 +2010,13 @@ void LayerTreeHostImpl::CreateResourceAndRasterWorkerPool( |
} |
if (GetRendererCapabilities().using_image) { |
- unsigned image_target = GL_TEXTURE_2D; |
-#if defined(OS_MACOSX) |
- // GL_TEXTURE_RECTANGLE_ARB target is required by IOSurface backed images. |
- DCHECK(context_provider->ContextCapabilities().gpu.texture_rectangle); |
- image_target = GL_TEXTURE_RECTANGLE_ARB; |
-#endif |
- if (settings_.use_image_external) { |
- DCHECK(context_provider->ContextCapabilities().gpu.egl_image_external); |
- image_target = GL_TEXTURE_EXTERNAL_OES; |
- } |
+ unsigned image_target = settings_.use_image_texture_target; |
+ DCHECK_IMPLIES( |
+ image_target == GL_TEXTURE_RECTANGLE_ARB, |
+ context_provider->ContextCapabilities().gpu.texture_rectangle); |
+ DCHECK_IMPLIES( |
+ image_target == GL_TEXTURE_EXTERNAL_OES, |
+ context_provider->ContextCapabilities().gpu.egl_image_external); |
if (settings_.use_zero_copy || IsSynchronousSingleThreaded()) { |
*resource_pool = |