From 554ffeb8b7c836da43a637c59eedfc617895b19d Mon Sep 17 00:00:00 2001
From: sergeyv <sergeyv@google.com>
Date: Tue, 15 Nov 2016 18:01:21 -0800
Subject: Support hardware bitmaps in bitmap shaders

Test: hwuimacro bitmapShaderEglImage --onscreen.
bug:30999911
Change-Id: I9d16a1c217a4474841794cf27ce49e3f7823678e
---
 libs/hwui/Program.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libs/hwui/Program.h')

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;
-- 
cgit v1.2.3-59-g8ed1b