diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-09-14 11:39:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-14 11:39:53 -0700 |
| commit | d3326231dc3d334054fbeeacdf691965d1618a0c (patch) | |
| tree | 57446faee5b38f37d9bd00aba59d50054900b23b /libs/rs/rsFont.h | |
| parent | 9322775014432ed6c87c864e98fe482f879ff233 (diff) | |
| parent | c984dd73c6f96d16e11813ae433ef70f7648ae77 (diff) | |
| download | frameworks_base-d3326231dc3d334054fbeeacdf691965d1618a0c.zip frameworks_base-d3326231dc3d334054fbeeacdf691965d1618a0c.tar.gz frameworks_base-d3326231dc3d334054fbeeacdf691965d1618a0c.tar.bz2 | |
Merge "Shader changes to allow for more flexible constant binding."
Diffstat (limited to 'libs/rs/rsFont.h')
| -rw-r--r-- | libs/rs/rsFont.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/rs/rsFont.h b/libs/rs/rsFont.h index defe38b..027ed1d 100644 --- a/libs/rs/rsFont.h +++ b/libs/rs/rsFont.h @@ -171,6 +171,7 @@ protected: Vector<Font*> mActiveFonts; // Render state for the font + ObjectBaseRef<Allocation> mFontShaderFConstant; ObjectBaseRef<ProgramFragment> mFontShaderF; ObjectBaseRef<Sampler> mFontSampler; ObjectBaseRef<ProgramStore> mFontProgramStore; |