Merge "Fix bad shader code" into jb-mr1-dev

This commit is contained in:
Chet Haase
2012-09-17 17:12:02 -07:00
committed by Android (Google) Code Review

View File

@@ -231,10 +231,10 @@ const char* gFS_Fast_SingleGradient[2] = {
}; };
const char* gFS_Fast_SingleModulateGradient[2] = { const char* gFS_Fast_SingleModulateGradient[2] = {
"\nvoid main(void) {\n" "\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", "}\n\n",
"\nvoid main(void) {\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" "}\n\n"
}; };