diff options
| author | Chet Haase <chet@google.com> | 2011-04-25 14:49:07 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2011-04-25 14:50:04 -0700 |
| commit | 6fca9884b3ea24d5775af4cf713fd81506913a39 (patch) | |
| tree | 374fa71493a7fe3fb1c871d67ef4928ebf28369a /libs/hwui/ProgramCache.h | |
| parent | 466e3a22db283958a1da71cc60a23ce3976a3659 (diff) | |
| download | frameworks_base-6fca9884b3ea24d5775af4cf713fd81506913a39.zip frameworks_base-6fca9884b3ea24d5775af4cf713fd81506913a39.tar.gz frameworks_base-6fca9884b3ea24d5775af4cf713fd81506913a39.tar.bz2 | |
Minor cleanup in GLrenderer code
Changed the way we use bitcodes for one of the rendering
options to make the code cleaner.
Change-Id: Ifaa965f228dbdad297a40da93bfbe63373986e35
Diffstat (limited to 'libs/hwui/ProgramCache.h')
| -rw-r--r-- | libs/hwui/ProgramCache.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/hwui/ProgramCache.h b/libs/hwui/ProgramCache.h index 9a7a2d2..18d98cb 100644 --- a/libs/hwui/ProgramCache.h +++ b/libs/hwui/ProgramCache.h @@ -57,7 +57,6 @@ namespace uirenderer { #define PROGRAM_KEY_COLOR_BLEND 0x80 #define PROGRAM_KEY_BITMAP_NPOT 0x100 #define PROGRAM_KEY_SWAP_SRC_DST 0x2000 -#define PROGRAM_KEY_VERTEX_WIDTH (1 << 37) #define PROGRAM_KEY_BITMAP_WRAPS_MASK 0x600 #define PROGRAM_KEY_BITMAP_WRAPT_MASK 0x1800 @@ -76,6 +75,8 @@ namespace uirenderer { #define PROGRAM_IS_POINT_SHIFT 36 +#define PROGRAM_HAS_WIDTH_SHIFT 37 + /////////////////////////////////////////////////////////////////////////////// // Types /////////////////////////////////////////////////////////////////////////////// @@ -205,7 +206,6 @@ struct ProgramDescription { programid key() const { programid key = 0; if (hasTexture) key |= PROGRAM_KEY_TEXTURE; - if (hasWidth) key |= PROGRAM_KEY_VERTEX_WIDTH; if (hasAlpha8Texture) key |= PROGRAM_KEY_A8_TEXTURE; if (hasBitmap) { key |= PROGRAM_KEY_BITMAP; @@ -239,6 +239,7 @@ struct ProgramDescription { if (swapSrcDst) key |= PROGRAM_KEY_SWAP_SRC_DST; if (modulate) key |= programid(0x1) << PROGRAM_MODULATE_SHIFT; if (isPoint) key |= programid(0x1) << PROGRAM_IS_POINT_SHIFT; + if (hasWidth) key |= programid(0x1) << PROGRAM_HAS_WIDTH_SHIFT; return key; } |