diff options
| author | 2017-03-07 18:37:09 +0000 | |
|---|---|---|
| committer | 2017-03-07 18:37:13 +0000 | |
| commit | 7ef25b78941ded7e1d757dc42897529a02fa10a3 (patch) | |
| tree | 7f273441eda4caa0213b74f77388de25f01edc0e /libs/hwui/ProgramCache.cpp | |
| parent | 31b0486d1b3bef3d84759299442146d054665505 (diff) | |
| parent | efb4b06493fe7b1604c762a448b13c7af2845a8d (diff) | |
Merge "Add ColorSpace information on Bitmap"
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
| -rw-r--r-- | libs/hwui/ProgramCache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp index ca056487a3ba..40ab7788f218 100644 --- a/libs/hwui/ProgramCache.cpp +++ b/libs/hwui/ProgramCache.cpp @@ -418,7 +418,7 @@ const char* gBlendOps[18] = { ProgramCache::ProgramCache(Extensions& extensions) : mHasES3(extensions.getMajorGlVersion() >= 3) - , mHasSRGB(extensions.hasSRGB()) { + , mHasLinearBlending(extensions.hasLinearBlending()) { } ProgramCache::~ProgramCache() { @@ -642,11 +642,11 @@ String8 ProgramCache::generateFragmentShader(const ProgramDescription& descripti } if (description.hasBitmap || ((description.hasTexture || description.hasExternalTexture) && !description.hasAlpha8Texture)) { - shader.append(gFS_OETF[description.hasLinearTexture && !mHasSRGB]); + shader.append(gFS_OETF[description.hasLinearTexture && !mHasLinearBlending]); } if (description.hasGradient) { shader.append(gFS_Gradient_Functions); - shader.append(gFS_Gradient_Preamble[mHasSRGB]); + shader.append(gFS_Gradient_Preamble[mHasLinearBlending]); } // Begin the shader |