diff options
| author | Chris Craik <ccraik@google.com> | 2015-02-06 23:06:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-06 23:06:44 +0000 |
| commit | f7ccbfbd9811e3b1c3accd9e3e92688d31a8a2bd (patch) | |
| tree | b08c13be9ce7e46c971db5437bcb94de5a5bb5ac /libs/hwui/Program.h | |
| parent | 12271e22014c2e2cd0ecdb9938ff8b618c68bc56 (diff) | |
| parent | 117bdbcfa3e8306dad21e7e01fa71b00cdfa7265 (diff) | |
| download | frameworks_base-f7ccbfbd9811e3b1c3accd9e3e92688d31a8a2bd.zip frameworks_base-f7ccbfbd9811e3b1c3accd9e3e92688d31a8a2bd.tar.gz frameworks_base-f7ccbfbd9811e3b1c3accd9e3e92688d31a8a2bd.tar.bz2 | |
Merge "Glop ColorFilter & VertexBuffer support, initial enable"
Diffstat (limited to 'libs/hwui/Program.h')
| -rw-r--r-- | libs/hwui/Program.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Program.h b/libs/hwui/Program.h index b637450..01231b5 100644 --- a/libs/hwui/Program.h +++ b/libs/hwui/Program.h @@ -102,7 +102,7 @@ typedef uint64_t programid; * A ProgramDescription must be used in conjunction with a ProgramCache. */ struct ProgramDescription { - enum ColorModifier { + enum ColorFilterMode { kColorNone = 0, kColorMatrix, kColorBlend @@ -148,7 +148,7 @@ struct ProgramDescription { GLenum bitmapWrapT; // Color operations - ColorModifier colorOp; + ColorFilterMode colorOp; SkXfermode::Mode colorMode; // Framebuffer blending (requires Extensions.hasFramebufferFetch()) |