diff options
author | 2017-02-27 11:00:04 -0800 | |
---|---|---|
committer | 2017-03-06 19:33:25 -0800 | |
commit | efb4b06493fe7b1604c762a448b13c7af2845a8d (patch) | |
tree | 310d40716decb7686065339226534dac0bb35faa /libs/hwui/GradientCache.cpp | |
parent | 4f357c081260c5bb36498169eb698adf7089899c (diff) |
Add ColorSpace information on Bitmap
This is the first step toward interpreting color spaces at render time.
Bug: 32984164
Test: BitmapColorSpaceTest in CtsGraphicsTestCases
Change-Id: I0164a18f1ed74a745874fe5229168042afe27a04
Diffstat (limited to 'libs/hwui/GradientCache.cpp')
-rw-r--r-- | libs/hwui/GradientCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/GradientCache.cpp b/libs/hwui/GradientCache.cpp index 71bee93fc4c7..18bfcc2bbddf 100644 --- a/libs/hwui/GradientCache.cpp +++ b/libs/hwui/GradientCache.cpp @@ -68,7 +68,7 @@ GradientCache::GradientCache(Extensions& extensions) , mMaxSize(Properties::gradientCacheSize) , mUseFloatTexture(extensions.hasFloatTextures()) , mHasNpot(extensions.hasNPot()) - , mHasSRGB(extensions.hasSRGB()) { + , mHasLinearBlending(extensions.hasLinearBlending()) { glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize); mCache.setOnEntryRemovedListener(this); @@ -263,7 +263,7 @@ void GradientCache::generateTexture(uint32_t* colors, float* positions, if (mUseFloatTexture) { texture->upload(GL_RGBA16F, width, height, GL_RGBA, GL_FLOAT, pixels); } else { - GLint internalFormat = mHasSRGB ? GL_SRGB8_ALPHA8 : GL_RGBA; + GLint internalFormat = mHasLinearBlending ? GL_SRGB8_ALPHA8 : GL_RGBA; texture->upload(internalFormat, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); } |