Adding support for per vertex opacity on textured layer

cc/shader.h

 // 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.
 
 #ifndef CC_SHADER_H_
 #define CC_SHADER_H_
 
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include <string>
 
@@ skipping 45 matching lines @@
 };
 
 class VertexShaderPosTexIdentity {
 public:
     void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex) { }
     std::string getShaderString() const;
 };
 
 class VertexShaderPosTexTransform {
 public:
-    VertexShaderPosTexTransform();
+  VertexShaderPosTexTransform();

[whunt, 2012/12/14 21:13:45]

Inconsistent tabbing.

[Jerome, 2012/12/14 21:48:47]

Done.

 
     void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
     std::string getShaderString() const;
 
     int matrixLocation() const { return m_matrixLocation; }
     int texTransformLocation() const { return m_texTransformLocation; }
+    int vertexOpacityLocation() const { return m_vertexOpacityLocation; }
 
 private:
     int m_matrixLocation;
     int m_texTransformLocation;
+    int m_vertexOpacityLocation;
 };
 
 class VertexShaderQuad {
 public:
     VertexShaderQuad();
 
     void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
     std::string getShaderString() const;
 
     int matrixLocation() const { return m_matrixLocation; }
@@ skipping 58 matching lines @@
     void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
     int alphaLocation() const { return -1; }
     int edgeLocation() const { return -1; }
     int fragmentTexTransformLocation() const { return -1; }
     int samplerLocation() const { return m_samplerLocation; }
 
 private:
     int m_samplerLocation;
 };
 
-class FragmentShaderRGBATexFlipAlpha : public FragmentTexAlphaBinding {
+class FragmentShaderRGBATexFlipVaryingAlpha : public FragmentTexOpaqueBinding {
 public:
     std::string getShaderString() const;
 };
+
+class FragmentShaderRGBATexVaryingAlpha : public FragmentTexOpaqueBinding {
+public:
+    std::string getShaderString() const;
+};
 
 class FragmentShaderRGBATexAlpha : public FragmentTexAlphaBinding {

[whunt, 2012/12/14 21:13:45]

Is this class used anymore?

[Jerome, 2012/12/14 21:48:47]

Yes by: TileProgram and RenderPassProgram

 public:
     std::string getShaderString() const;
 };
 
-class FragmentShaderRGBATexRectFlipAlpha : public FragmentTexAlphaBinding {
+class FragmentShaderRGBATexRectFlipVaryingAlpha : public FragmentTexAlphaBinding {
 public:
     std::string getShaderString() const;
 };
 
-class FragmentShaderRGBATexRectAlpha : public FragmentTexAlphaBinding {
+class FragmentShaderRGBATexRectVaryingAlpha : public FragmentTexAlphaBinding {
 public:
     std::string getShaderString() const;
 };
 
 class FragmentShaderRGBATexOpaque : public FragmentTexOpaqueBinding {
 public:
     std::string getShaderString() const;
 };
 
 class FragmentShaderRGBATex : public FragmentTexOpaqueBinding {
@@ skipping 157 matching lines @@
 private:
     int m_alphaLocation;
     int m_texTransformLocation;
     int m_frequencyLocation;
     int m_colorLocation;
 };
 
 } // namespace cc
 
 #endif  // CC_SHADER_H_