diff options
| author | Chris Craik <ccraik@google.com> | 2015-02-13 17:47:21 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-02-17 15:45:46 -0800 |
| commit | 922d3a7f6f8c1c05a996ee3e91e8cbadfff560c9 (patch) | |
| tree | 9b8acab9755321ae0e7564d2250f2106117412cb /libs/hwui/Glop.h | |
| parent | 91d415d863de73430af100ebd1b4f5b3b795e8d1 (diff) | |
| download | frameworks_base-922d3a7f6f8c1c05a996ee3e91e8cbadfff560c9.zip frameworks_base-922d3a7f6f8c1c05a996ee3e91e8cbadfff560c9.tar.gz frameworks_base-922d3a7f6f8c1c05a996ee3e91e8cbadfff560c9.tar.bz2 | |
Glop SkiaShader support
Change-Id: I894a0b62701bd02367ab970813e4c332147351a2
Diffstat (limited to 'libs/hwui/Glop.h')
| -rw-r--r-- | libs/hwui/Glop.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ namespace uirenderer { class Program; class RoundRectClipState; +class Texture; /* * Enumerates optional vertex attributes @@ -89,11 +92,6 @@ struct Glop { bool colorEnabled; FloatColor color; - /* TODO - union shader { - //... - }; TODO - */ ProgramDescription::ColorFilterMode filterMode; union Filter { struct Matrix { @@ -102,6 +100,8 @@ struct Glop { } matrix; FloatColor color; } filter; + + SkiaShaderData skiaShaderData; } fill; struct Transform { |