Index: cc/shader.h |
diff --git a/cc/shader.h b/cc/shader.h |
index 67e93cbcf09e2010b017111733941ab166eeb956..661522b868453aa7fe144c94cd0a2771fc9eb83a 100644 |
--- a/cc/shader.h |
+++ b/cc/shader.h |
@@ -63,17 +63,19 @@ public: |
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 { |
@@ -152,7 +154,12 @@ 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; |
}; |
@@ -162,12 +169,12 @@ 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; |
}; |