diff options
| author | Stephen Hines <srhines@google.com> | 2012-04-11 17:27:29 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-04-11 18:15:55 -0700 |
| commit | 3a2914132146f340511425d7f78540098606b512 (patch) | |
| tree | cac181c8235b60f244e31e83a7c156b97101592f | |
| parent | 7e6ee74ac40396746f814d57160e30543e632c9a (diff) | |
| download | frameworks_base-3a2914132146f340511425d7f78540098606b512.zip frameworks_base-3a2914132146f340511425d7f78540098606b512.tar.gz frameworks_base-3a2914132146f340511425d7f78540098606b512.tar.bz2 | |
Add missing support for Element.FONT().
Change-Id: Id66676958cc41d934b7f01acd65916f6d777d355
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/Element.java | 10 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/RenderScript.java | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 35ae56b..539eb60 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18089,6 +18089,7 @@ package android.renderscript { method public static android.renderscript.Element F64_2(android.renderscript.RenderScript); method public static android.renderscript.Element F64_3(android.renderscript.RenderScript); method public static android.renderscript.Element F64_4(android.renderscript.RenderScript); + method public static android.renderscript.Element FONT(android.renderscript.RenderScript); method public static android.renderscript.Element I16(android.renderscript.RenderScript); method public static android.renderscript.Element I16_2(android.renderscript.RenderScript); method public static android.renderscript.Element I16_3(android.renderscript.RenderScript); @@ -18174,6 +18175,7 @@ package android.renderscript { enum_constant public static final android.renderscript.Element.DataType MATRIX_4X4; enum_constant public static final android.renderscript.Element.DataType RS_ALLOCATION; enum_constant public static final android.renderscript.Element.DataType RS_ELEMENT; + enum_constant public static final android.renderscript.Element.DataType RS_FONT; enum_constant public static final android.renderscript.Element.DataType RS_MESH; enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_FRAGMENT; enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_RASTER; diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java index d75c951..4afe9d9 100644 --- a/graphics/java/android/renderscript/Element.java +++ b/graphics/java/android/renderscript/Element.java @@ -150,7 +150,8 @@ public class Element extends BaseObj { RS_PROGRAM_FRAGMENT (1006, 4), RS_PROGRAM_VERTEX (1007, 4), RS_PROGRAM_RASTER (1008, 4), - RS_PROGRAM_STORE (1009, 4); + RS_PROGRAM_STORE (1009, 4), + RS_FONT (1010, 4); int mID; int mSize; @@ -455,6 +456,13 @@ public class Element extends BaseObj { return rs.mElement_PROGRAM_STORE; } + public static Element FONT(RenderScript rs) { + if(rs.mElement_FONT == null) { + rs.mElement_FONT = createUser(rs, DataType.RS_FONT); + } + return rs.mElement_FONT; + } + public static Element A_8(RenderScript rs) { if(rs.mElement_A_8 == null) { diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 03294b5..abbcdd9 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -664,6 +664,7 @@ public class RenderScript { Element mElement_PROGRAM_VERTEX; Element mElement_PROGRAM_RASTER; Element mElement_PROGRAM_STORE; + Element mElement_FONT; Element mElement_A_8; Element mElement_RGB_565; |