Chromium Code Reviews| Index: cc/shader.cc |
| diff --git a/cc/shader.cc b/cc/shader.cc |
| index a9a0877db05fb2067f316711b049eee7fda6b54b..c84d88aeccc948abe96257d14778f0a843d6cb20 100644 |
| --- a/cc/shader.cc |
| +++ b/cc/shader.cc |
| @@ -159,13 +159,14 @@ std::string VertexShaderPosTexTransform::getShaderString() const |
| return SHADER( |
| attribute vec4 a_position; |
| attribute vec2 a_texCoord; |
| - uniform mat4 matrix; |
| - uniform vec4 texTransform; |
| + attribute float a_index; |
|
shawnsingh
2012/11/28 19:44:16
If my prior comment about using the array of struc
|
| + uniform mat4 matrix[8]; |
| + uniform vec4 texTransform[8]; |
| varying vec2 v_texCoord; |
| void main() |
| { |
| - gl_Position = matrix * a_position; |
| - v_texCoord = a_texCoord * texTransform.zw + texTransform.xy; |
| + gl_Position = matrix[int(a_index)] * a_position; |
| + v_texCoord = a_texCoord * texTransform[int(a_index)].zw + texTransform[int(a_index)].xy; |
| } |
| ); |
| } |