cc: Render TextureLayer which texture target is not GL_TEXTURE_2D correctly.

cc/output/gl_renderer.h

 // Copyright 2010 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.
 
 #ifndef CC_OUTPUT_GL_RENDERER_H_
 #define CC_OUTPUT_GL_RENDERER_H_
 
 #include "base/cancelable_callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_deque.h"
@@ skipping 369 matching lines @@
       TexCoordPrecision precision,
       SamplerType sampler,
       BlendMode blend_mode,
       bool mask_for_background);
   const RenderPassMaskColorMatrixProgramAA*
   GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision,
                                         SamplerType sampler,
                                         BlendMode blend_mode,
                                         bool mask_for_background);
 
-  const TextureProgram* GetTextureProgram(
-      TexCoordPrecision precision);
+  const TextureProgram* GetTextureProgram(TexCoordPrecision precision,
+                                          SamplerType sampler);
   const NonPremultipliedTextureProgram* GetNonPremultipliedTextureProgram(
-      TexCoordPrecision precision);
+      TexCoordPrecision precision,
+      SamplerType sampler);
   const TextureBackgroundProgram* GetTextureBackgroundProgram(
-      TexCoordPrecision precision);
+      TexCoordPrecision precision,
+      SamplerType sampler);
   const NonPremultipliedTextureBackgroundProgram*
-      GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision);
+  GetNonPremultipliedTextureBackgroundProgram(TexCoordPrecision precision,
+                                              SamplerType sampler);
   const TextureProgram* GetTextureIOSurfaceProgram(
       TexCoordPrecision precision);
 
   const VideoYUVProgram* GetVideoYUVProgram(
       TexCoordPrecision precision);
   const VideoYUVAProgram* GetVideoYUVAProgram(
       TexCoordPrecision precision);
   const VideoStreamTextureProgram* GetVideoStreamTextureProgram(
       TexCoordPrecision precision);
 
@@ skipping 10 matching lines @@
   TileProgramSwizzle tile_program_swizzle_[LAST_TEX_COORD_PRECISION +
                                            1][LAST_SAMPLER_TYPE + 1];
   TileProgramSwizzleOpaque
       tile_program_swizzle_opaque_[LAST_TEX_COORD_PRECISION +
                                    1][LAST_SAMPLER_TYPE + 1];
   TileProgramSwizzleAA tile_program_swizzle_aa_[LAST_TEX_COORD_PRECISION +
                                                 1][LAST_SAMPLER_TYPE + 1];
 
   TileCheckerboardProgram tile_checkerboard_program_;
 
-  TextureProgram texture_program_[LAST_TEX_COORD_PRECISION + 1];
+  TextureProgram
+      texture_program_[LAST_TEX_COORD_PRECISION + 1][LAST_SAMPLER_TYPE + 1];
   NonPremultipliedTextureProgram
-      nonpremultiplied_texture_program_[LAST_TEX_COORD_PRECISION + 1];
+      nonpremultiplied_texture_program_[LAST_TEX_COORD_PRECISION +
+                                        1][LAST_SAMPLER_TYPE + 1];
   TextureBackgroundProgram
-      texture_background_program_[LAST_TEX_COORD_PRECISION + 1];
+      texture_background_program_[LAST_TEX_COORD_PRECISION +
+                                  1][LAST_SAMPLER_TYPE + 1];
   NonPremultipliedTextureBackgroundProgram
       nonpremultiplied_texture_background_program_[LAST_TEX_COORD_PRECISION +
-                                                   1];
+                                                   1][LAST_SAMPLER_TYPE + 1];
   TextureProgram texture_io_surface_program_[LAST_TEX_COORD_PRECISION + 1];
 
   RenderPassProgram
       render_pass_program_[LAST_TEX_COORD_PRECISION + 1][LAST_BLEND_MODE + 1];
   RenderPassProgramAA render_pass_program_aa_[LAST_TEX_COORD_PRECISION +
                                               1][LAST_BLEND_MODE + 1];
   RenderPassMaskProgram
       render_pass_mask_program_[LAST_TEX_COORD_PRECISION + 1]
                                [LAST_SAMPLER_TYPE + 1]
                                [LAST_BLEND_MODE + 1]
@@ skipping 62 matching lines @@
 
   SkBitmap on_demand_tile_raster_bitmap_;
   ResourceProvider::ResourceId on_demand_tile_raster_resource_id_;
   BoundGeometry bound_geometry_;
   DISALLOW_COPY_AND_ASSIGN(GLRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_