summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
authorsergeyv <sergeyv@google.com>2016-11-15 18:01:21 -0800
committersergeyv <sergeyv@google.com>2016-11-15 18:43:09 -0800
commit554ffeb8b7c836da43a637c59eedfc617895b19d (patch)
tree6504dca36ac62ce5ce4a1c37ad3342769e734105 /libs/hwui/ProgramCache.cpp
parentebd6c240318bd87554b274d18e15e21ba510a590 (diff)
Support hardware bitmaps in bitmap shaders
Test: hwuimacro bitmapShaderEglImage --onscreen. bug:30999911 Change-Id: I9d16a1c217a4474841794cf27ce49e3f7823678e
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
-rw-r--r--libs/hwui/ProgramCache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index 1afc97839b44..0c2309faf4ea 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -707,7 +707,7 @@ String8 ProgramCache::generateFragmentShader(const ProgramDescription& descripti
if (blendFramebuffer) {
generateBlend(shader, "blendFramebuffer", description.framebufferMode);
}
- if (description.isBitmapNpot) {
+ if (description.useShaderBasedWrap) {
generateTextureWrap(shader, description.bitmapWrapS, description.bitmapWrapT);
}
if (description.hasGradient) {
@@ -736,7 +736,7 @@ String8 ProgramCache::generateFragmentShader(const ProgramDescription& descripti
shader.append(gFS_Main_FetchGradient[gradientIndex(description)]);
}
if (description.hasBitmap) {
- if (!description.isBitmapNpot) {
+ if (!description.useShaderBasedWrap) {
shader.append(gFS_Main_FetchBitmap);
} else {
shader.append(gFS_Main_FetchBitmapNpot);