[cc] Add nearest neighbor filtering for TextureLayer.

cc/layers/texture_layer_impl.cc

 // Copyright 2011 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 "cc/layers/texture_layer_impl.h"
 
 #include <vector>
 
 #include "base/strings/stringprintf.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/resources/single_release_callback_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/occlusion.h"
 
 namespace cc {
 
 TextureLayerImpl::TextureLayerImpl(LayerTreeImpl* tree_impl, int id)
     : LayerImpl(tree_impl, id),
       external_texture_resource_(0),
       premultiplied_alpha_(true),
       blend_background_color_(false),
       flipped_(true),
+      nearest_neighbor_(false),
       uv_top_left_(0.f, 0.f),
       uv_bottom_right_(1.f, 1.f),
       own_mailbox_(false),
       valid_texture_copy_(false) {
   vertex_opacity_[0] = 1.0f;
   vertex_opacity_[1] = 1.0f;
   vertex_opacity_[2] = 1.0f;
   vertex_opacity_[3] = 1.0f;
 }
 
@@ skipping 19 matching lines @@
 void TextureLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   LayerImpl::PushPropertiesTo(layer);
 
   TextureLayerImpl* texture_layer = static_cast<TextureLayerImpl*>(layer);
   texture_layer->SetFlipped(flipped_);
   texture_layer->SetUVTopLeft(uv_top_left_);
   texture_layer->SetUVBottomRight(uv_bottom_right_);
   texture_layer->SetVertexOpacity(vertex_opacity_);
   texture_layer->SetPremultipliedAlpha(premultiplied_alpha_);
   texture_layer->SetBlendBackgroundColor(blend_background_color_);
+  texture_layer->SetNearestNeighbor(nearest_neighbor_);
   if (own_mailbox_) {
     texture_layer->SetTextureMailbox(texture_mailbox_,
                                      release_callback_.Pass());
     own_mailbox_ = false;
   }
 }
 
 bool TextureLayerImpl::WillDraw(DrawMode draw_mode,
                                 ResourceProvider* resource_provider) {
   if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE)
@@ skipping 19 matching lines @@
       texture_mailbox_.IsSharedMemory()) {
     DCHECK(!external_texture_resource_);
     // Have to upload a copy to a texture for it to be used in a
     // hardware draw.
     if (!texture_copy_)
       texture_copy_ = ScopedResource::Create(resource_provider);
     if (texture_copy_->size() != texture_mailbox_.shared_memory_size() ||
         resource_provider->InUseByConsumer(texture_copy_->id()))
       texture_copy_->Free();
 
+    //if (nearest_neighbor_)
+      //texture_copy_->filter = GL_NEAREST;
+
     if (!texture_copy_->id()) {
       texture_copy_->Allocate(texture_mailbox_.shared_memory_size(),
-                              ResourceProvider::TextureHintImmutable,
+                              ResourceProvider::TextureHintDefault,

[piman, 2014/10/28 05:09:50]

Why changing this? (and other places)
Immutability refers to the dimensions/format, not to the pixels or filtering
mode.

[jackhou1, 2014/10/29 00:12:25]

Oops, I wasn't sure if this mattered. Removed.

                               resource_provider->best_texture_format());
     }
 
     if (texture_copy_->id()) {
       std::vector<uint8> swizzled;
       uint8* pixels =
           static_cast<uint8*>(texture_mailbox_.shared_memory()->memory());
 
       if (!PlatformColor::SameComponentOrder(texture_copy_->format())) {
         // Swizzle colors. This is slow, but should be really uncommon.
@@ skipping 11 matching lines @@
       resource_provider->SetPixels(
           texture_copy_->id(),
           pixels,
           gfx::Rect(texture_mailbox_.shared_memory_size()),
           gfx::Rect(texture_mailbox_.shared_memory_size()),
           gfx::Vector2d());
 
       valid_texture_copy_ = true;
     }
   }
-  return (external_texture_resource_ || valid_texture_copy_) &&
+  bool result = (external_texture_resource_ || valid_texture_copy_) &&
          LayerImpl::WillDraw(draw_mode, resource_provider);
+  //printf("TextureLayerImpl::WillDraw %d %p\n", result, this);
+  return result;
 }
 
 void TextureLayerImpl::AppendQuads(RenderPass* render_pass,
                                    const Occlusion& occlusion_in_content_space,
                                    AppendQuadsData* append_quads_data) {
   DCHECK(external_texture_resource_ || valid_texture_copy_);
 
   SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
   PopulateSharedQuadState(shared_quad_state);
 
   AppendDebugBorderQuad(
       render_pass, content_bounds(), shared_quad_state, append_quads_data);
 
   SkColor bg_color = blend_background_color_ ?
       background_color() : SK_ColorTRANSPARENT;
   bool opaque = contents_opaque() || (SkColorGetA(bg_color) == 0xFF);
 
   gfx::Rect quad_rect(content_bounds());
   gfx::Rect opaque_rect = opaque ? quad_rect : gfx::Rect();
   gfx::Rect visible_quad_rect =
       occlusion_in_content_space.GetUnoccludedContentRect(quad_rect);
   if (visible_quad_rect.IsEmpty())
     return;
 
   TextureDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
   ResourceProvider::ResourceId id =
       valid_texture_copy_ ? texture_copy_->id() : external_texture_resource_;
+
+  //printf("TextureLayerImpl::AppendQuads %d %d %p\n", nearest_neighbor_, id, this);
   quad->SetNew(shared_quad_state,
                quad_rect,
                opaque_rect,
                visible_quad_rect,
                id,
                premultiplied_alpha_,
                uv_top_left_,
                uv_bottom_right_,
                bg_color,
                vertex_opacity_,
-               flipped_);
+               flipped_,
+               nearest_neighbor_);
 }
 
 SimpleEnclosedRegion TextureLayerImpl::VisibleContentOpaqueRegion() const {
   if (contents_opaque())
     return SimpleEnclosedRegion(visible_content_rect());
 
   if (blend_background_color_ && (SkColorGetA(background_color()) == 0xFF))
     return SimpleEnclosedRegion(visible_content_rect());
 
   return SimpleEnclosedRegion();
@@ skipping 14 matching lines @@
 void TextureLayerImpl::SetBlendBackgroundColor(bool blend) {
   blend_background_color_ = blend;
   SetNeedsPushProperties();
 }
 
 void TextureLayerImpl::SetFlipped(bool flipped) {
   flipped_ = flipped;
   SetNeedsPushProperties();
 }
 
+void TextureLayerImpl::SetNearestNeighbor(bool nearest_neighbor) {
+  //printf("TextureLayerImpl::SetNearestNeighbor %d %p\n", nearest_neighbor, this);
+  nearest_neighbor_ = nearest_neighbor;
+  SetNeedsPushProperties();
+}
+
 void TextureLayerImpl::SetUVTopLeft(const gfx::PointF top_left) {
   uv_top_left_ = top_left;
   SetNeedsPushProperties();
 }
 
 void TextureLayerImpl::SetUVBottomRight(const gfx::PointF bottom_right) {
   uv_bottom_right_ = bottom_right;
   SetNeedsPushProperties();
 }
 
@@ skipping 25 matching lines @@
   } else if (external_texture_resource_) {
     DCHECK(!own_mailbox_);
     ResourceProvider* resource_provider =
         layer_tree_impl()->resource_provider();
     resource_provider->DeleteResource(external_texture_resource_);
     external_texture_resource_ = 0;
   }
 }
 
 }  // namespace cc