summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.h
diff options
context:
space:
mode:
author sergeyv <sergeyv@google.com> 2016-11-15 18:01:21 -0800
committer sergeyv <sergeyv@google.com> 2016-11-15 18:43:09 -0800
commit554ffeb8b7c836da43a637c59eedfc617895b19d (patch)
tree6504dca36ac62ce5ce4a1c37ad3342769e734105 /libs/hwui/Program.h
parentebd6c240318bd87554b274d18e15e21ba510a590 (diff)
Support hardware bitmaps in bitmap shaders
Test: hwuimacro bitmapShaderEglImage --onscreen. bug:30999911 Change-Id: I9d16a1c217a4474841794cf27ce49e3f7823678e
Diffstat (limited to 'libs/hwui/Program.h')
-rw-r--r--libs/hwui/Program.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/Program.h b/libs/hwui/Program.h
index e410d71e9676..9c4cb098b4c3 100644
--- a/libs/hwui/Program.h
+++ b/libs/hwui/Program.h
@@ -133,7 +133,7 @@ struct ProgramDescription {
// Shaders
bool hasBitmap;
- bool isBitmapNpot;
+ bool useShaderBasedWrap;
bool hasVertexAlpha;
bool useShadowAlphaInterp;
@@ -180,7 +180,7 @@ struct ProgramDescription {
modulate = false;
hasBitmap = false;
- isBitmapNpot = false;
+ useShaderBasedWrap = false;
hasGradient = false;
gradientType = kGradientLinear;
@@ -234,7 +234,7 @@ struct ProgramDescription {
if (hasAlpha8Texture) key |= PROGRAM_KEY_A8_TEXTURE;
if (hasBitmap) {
key |= PROGRAM_KEY_BITMAP;
- if (isBitmapNpot) {
+ if (useShaderBasedWrap) {
key |= PROGRAM_KEY_BITMAP_NPOT;
key |= getEnumForWrap(bitmapWrapS) << PROGRAM_BITMAP_WRAPS_SHIFT;
key |= getEnumForWrap(bitmapWrapT) << PROGRAM_BITMAP_WRAPT_SHIFT;