diff options
| author | Chet Haase <chet@google.com> | 2012-09-18 14:13:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 14:13:57 -0700 |
| commit | 48618c987eed656bf3d8baa6ce25b7f5d3f4a43e (patch) | |
| tree | f5f4bd5532977ec9c456aa425235fbbd76c06a9f | |
| parent | cdf964eab3cb9381745886f35b8c5a73ba61e28d (diff) | |
| parent | 0990ffbc4d407e174423a4a04b5902ed83f71db5 (diff) | |
| download | frameworks_base-48618c987eed656bf3d8baa6ce25b7f5d3f4a43e.zip frameworks_base-48618c987eed656bf3d8baa6ce25b7f5d3f4a43e.tar.gz frameworks_base-48618c987eed656bf3d8baa6ce25b7f5d3f4a43e.tar.bz2 | |
Merge "Fix GL shader bugs" into jb-mr1-dev
| -rw-r--r-- | libs/hwui/Program.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/ProgramCache.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 984461c..5b1b57d 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -178,7 +178,7 @@ void Program::setColor(const float r, const float g, const float b, const float void Program::use() { glUseProgram(mProgramId); if (texCoords >= 0 && !mHasSampler) { - glUniform1i(getUniform("sampler"), 0); + glUniform1i(getUniform("baseSampler"), 0); mHasSampler = true; } mUse = true; diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp index 2d13f60..6baf448 100644 --- a/libs/hwui/ProgramCache.cpp +++ b/libs/hwui/ProgramCache.cpp @@ -294,8 +294,8 @@ const char* gFS_Main_BlendShaders_Modulate[6] = { ";\n", ";\n", // Modulate - " * fragColor.a;\n", - " * fragColor.a;\n", + " * color.a;\n", + " * color.a;\n", // Modulate with alpha 8 texture " * texture2D(baseSampler, outTexCoords).a;\n", " * pow(texture2D(baseSampler, outTexCoords).a, gamma);\n" @@ -305,8 +305,8 @@ const char* gFS_Main_GradientShader_Modulate[6] = { " fragColor = gradientColor;\n", " fragColor = gradientColor;\n", // Modulate - " fragColor = gradientColor * fragColor.a;\n", - " fragColor = gradientColor * fragColor.a;\n", + " fragColor = gradientColor * color.a;\n", + " fragColor = gradientColor * color.a;\n", // Modulate with alpha 8 texture " fragColor = gradientColor * texture2D(baseSampler, outTexCoords).a;\n", " fragColor = gradientColor * pow(texture2D(baseSampler, outTexCoords).a, gamma);\n" @@ -316,8 +316,8 @@ const char* gFS_Main_BitmapShader_Modulate[6] = { " fragColor = bitmapColor;\n", " fragColor = bitmapColor;\n", // Modulate - " fragColor = bitmapColor * fragColor.a;\n", - " fragColor = bitmapColor * fragColor.a;\n", + " fragColor = bitmapColor * color.a;\n", + " fragColor = bitmapColor * color.a;\n", // Modulate with alpha 8 texture " fragColor = bitmapColor * texture2D(baseSampler, outTexCoords).a;\n", " fragColor = bitmapColor * pow(texture2D(baseSampler, outTexCoords).a, gamma);\n" |