diff options
| author | Chet Haase <chet@google.com> | 2012-09-17 17:12:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-17 17:12:03 -0700 |
| commit | a8a402f8ad1549e23f4238786269bd548b6b445d (patch) | |
| tree | 205aff27573792f891dece6340c79a0fb1a69cab /libs | |
| parent | 04d5b9fbd1f9b8c7fa4af402166028c685574d62 (diff) | |
| parent | 1c5c206953d673f8424908c77c974c06d5b99a9c (diff) | |
| download | frameworks_base-a8a402f8ad1549e23f4238786269bd548b6b445d.zip frameworks_base-a8a402f8ad1549e23f4238786269bd548b6b445d.tar.gz frameworks_base-a8a402f8ad1549e23f4238786269bd548b6b445d.tar.bz2 | |
Merge "Fix bad shader code" into jb-mr1-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/ProgramCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp index 6e7f35d..2d13f60 100644 --- a/libs/hwui/ProgramCache.cpp +++ b/libs/hwui/ProgramCache.cpp @@ -231,10 +231,10 @@ const char* gFS_Fast_SingleGradient[2] = { }; const char* gFS_Fast_SingleModulateGradient[2] = { "\nvoid main(void) {\n" - " gl_FragColor " FS_MAIN_DITHER " + color.a * texture2D(gradientSampler, linear);\n" + " gl_FragColor = " FS_MAIN_DITHER " + color.a * texture2D(gradientSampler, linear);\n" "}\n\n", "\nvoid main(void) {\n" - " gl_FragColor " FS_MAIN_DITHER " + color.a * mix(startColor, endColor, clamp(linear, 0.0, 1.0));\n" + " gl_FragColor = " FS_MAIN_DITHER " + color.a * mix(startColor, endColor, clamp(linear, 0.0, 1.0));\n" "}\n\n" }; |