drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid invalid shader creation for certain blend modes

Browse Source 
bug:19627342

Change-Id: I41e3c1ce8e6fa52f046ec492d19de7cab92b9ec5
This commit is contained in:
Chris Craik
2015-03-06 09:40:35 -08:00
parent be331a3809
commit 1c1c3fe9eb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/hwui/ProgramCache.cpp
View File

@ -777,6 +777,9 @@ String8 ProgramCache::generateFragmentShader(const ProgramDescription& descripti
}
void ProgramCache::generateBlend(String8& shader, const char* name, SkXfermode::Mode mode) {
// TODO: update gBlendOps so this workaround isn't necessary
if (mode > SkXfermode::kPlus_Mode) mode = SkXfermode::kClear_Mode;
shader.append("\nvec4 ");
shader.append(name);
shader.append("(vec4 src, vec4 dst) {\n");
@ -830,7 +833,7 @@ void ProgramCache::printLongString(const String8& shader) const {
while ((index = shader.find("\n", index)) > -1) {
String8 line(str, index - lastIndex);
if (line.length() == 0) line.append("\n");
PROGRAM_LOGD("%s", line.string());
ALOGD("%s", line.string());
index++;
str += (index - lastIndex);
lastIndex = index;