Restrict ETC1 power-of-two rounding to old IMG drivers.

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 521 matching lines @@
 scoped_ptr<cc::OutputSurface> CompositorImpl::CreateOutputSurface(
     bool fallback) {
   blink::WebGraphicsContext3D::Attributes attrs;
   attrs.shareResources = true;
   attrs.noAutomaticFlushes = true;
   pending_swapbuffers_ = 0;
 
   DCHECK(window_);
   DCHECK(surface_id_);
 
-  scoped_refptr<ContextProviderCommandBuffer> context_provider;
   BrowserGpuChannelHostFactory* factory =
       BrowserGpuChannelHostFactory::instance();
   scoped_refptr<GpuChannelHost> gpu_channel_host = factory->GetGpuChannel();
   if (gpu_channel_host && !gpu_channel_host->IsLost()) {
-    context_provider = ContextProviderCommandBuffer::Create(
+    context_provider_ = ContextProviderCommandBuffer::Create(

[no sievers, 2014/08/21 23:02:50]

Is there a way we can pass this through without having to hold on to a context
reference here?
I'm worried it might cause some issues with how things get torn down.
Maybe through LayerTreeSettings?
Or the OutputSurfaceWithoutParent (above) could maybe have a backpointer to
CompositorImpl and pass back the capabilities from BindToClient().

[aelias_OOO_until_Jul13, 2014/08/23 01:28:50]

Done, I took the OutputSurfaceWithoutParent approach.

         CreateGpuProcessViewContext(gpu_channel_host, attrs, surface_id_),
         "BrowserCompositor");
   }
-  if (!context_provider.get()) {
+  if (!context_provider_.get()) {
     LOG(ERROR) << "Failed to create 3D context for compositor.";
     return scoped_ptr<cc::OutputSurface>();
   }
 
   return scoped_ptr<cc::OutputSurface>(
-      new OutputSurfaceWithoutParent(context_provider));
+      new OutputSurfaceWithoutParent(context_provider_));
+}
+
+void CompositorImpl::DidInitializeOutputSurface() {
+  ui_resource_provider_.SetSupportsETC1NonPowerOfTwo(
+      context_provider_->ContextCapabilities().gpu.texture_format_etc1_npot);
 }
 
 void CompositorImpl::OnLostResources() {
   client_->DidLoseResources();
   ui_resource_provider_.UIResourcesAreInvalid();
 }
 
 void CompositorImpl::ScheduleComposite() {
   DCHECK(!needs_composite_ || WillComposite());
   if (ignore_schedule_composite_)
@@ skipping 77 matching lines @@
 }
 
 void CompositorImpl::SetNeedsAnimate() {
   if (!host_)
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content