Merge "Apply 3D transformations to gradient shaders."

1 files changed, 1 insertions, 5 deletions

diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index 3e9412cf0c78..d1a1b45bb2d3 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -35,9 +35,6 @@ const char* gVS_Header_Uniforms =
         "uniform mat4 transform;\n";
 const char* gVS_Header_Uniforms_HasGradient[3] = {
         // Linear
-        "uniform float gradientLength;\n"
-        "uniform vec2 gradient;\n"
-        "uniform vec2 gradientStart;\n"
         "uniform mat4 screenSpace;\n",
         // Circular
         "uniform vec2 gradientStart;\n"
@@ -69,8 +66,7 @@ const char* gVS_Main_OutTexCoords =
         "    outTexCoords = texCoords;\n";
 const char* gVS_Main_OutGradient[3] = {
         // Linear
-        "    vec4 location = screenSpace * position;\n"
-        "    index = dot(location.xy - gradientStart, gradient) * gradientLength;\n",
+        "    index = (screenSpace * position).x;\n",
         // Circular
         "    vec4 location = screenSpace * position;\n"
         "    circular = (gradientMatrix * vec4(location.xy - gradientStart, 0.0, 0.0)).xy;\n",