commit 922d3a7f6f8c1c05a996ee3e91e8cbadfff560c9
author Chris Craik <ccraik@google.com> Fri Feb 13 17:47:21 2015 -0800
committer Chris Craik <ccraik@google.com> Tue Feb 17 15:45:46 2015 -0800
tree 9b8acab9755321ae0e7564d2250f2106117412cb
parent 91d415d863de73430af100ebd1b4f5b3b795e8d1

Glop SkiaShader support

Change-Id: I894a0b62701bd02367ab970813e4c332147351a2

libs/hwui/Glop.h

diff --git a/libs/hwui/Glop.h b/libs/hwui/Glop.h
index 10dbd5c..6eca468 100644
--- a/libs/hwui/Glop.h
+++ b/libs/hwui/Glop.h
@@ -19,7 +19,9 @@
 
 #include "FloatColor.h"
 #include "Matrix.h"
+#include "Program.h"
 #include "Rect.h"
+#include "SkiaShader.h"
 #include "utils/Macros.h"
 
 #include <GLES2/gl2.h>
@@ -31,6 +33,7 @@
 
 class Program;
 class RoundRectClipState;
+class Texture;
 
 /*
  * Enumerates optional vertex attributes
@@ -89,11 +92,6 @@
         bool colorEnabled;
         FloatColor color;
 
-        /* TODO
-        union shader {
-            //...
-        }; TODO
-        */
         ProgramDescription::ColorFilterMode filterMode;
         union Filter {
             struct Matrix {
@@ -102,6 +100,8 @@
             } matrix;
             FloatColor color;
         } filter;
+
+        SkiaShaderData skiaShaderData;
     } fill;
 
     struct Transform {