summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.h
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2015-02-05 10:12:38 -0800
committer Chris Craik <ccraik@google.com> 2015-02-06 13:42:25 -0800
commit117bdbcfa3e8306dad21e7e01fa71b00cdfa7265 (patch)
treeaa54e4a5538818cd946bbd6e7eb771b83d0cfebd /libs/hwui/Program.h
parent34725687748cc2b4ace2bdb49becfdcd569e9a5d (diff)
Glop ColorFilter & VertexBuffer support, initial enable
Enables Glop rendering for supported Rects and VertexBuffers Also removes unused Query object Change-Id: Ibe227bc362685a153159f75077664f0947764e06
Diffstat (limited to 'libs/hwui/Program.h')
-rw-r--r--libs/hwui/Program.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Program.h b/libs/hwui/Program.h
index b63745002158..01231b52c84e 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())