diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-06-25 09:24:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-25 09:24:19 -0700 |
| commit | 5b7e333cf2f91c94e37dbb7024fa38da3db34619 (patch) | |
| tree | deeda2cde4fc739586fbb27956d472a419849f80 /libs/rs/scriptc | |
| parent | c086d9403f08d4f7505eff4dfdd61e0f22d26abf (diff) | |
| parent | 9b949fce39f0f39ce9275b71d7c347210775e7a8 (diff) | |
| download | frameworks_base-5b7e333cf2f91c94e37dbb7024fa38da3db34619.zip frameworks_base-5b7e333cf2f91c94e37dbb7024fa38da3db34619.tar.gz frameworks_base-5b7e333cf2f91c94e37dbb7024fa38da3db34619.tar.bz2 | |
Merge "Adding freetype font rendering to renderscript."
Diffstat (limited to 'libs/rs/scriptc')
| -rw-r--r-- | libs/rs/scriptc/rs_graphics.rsh | 4 | ||||
| -rw-r--r-- | libs/rs/scriptc/rs_types.rsh | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libs/rs/scriptc/rs_graphics.rsh b/libs/rs/scriptc/rs_graphics.rsh index c9667d0..fba3d6d 100644 --- a/libs/rs/scriptc/rs_graphics.rsh +++ b/libs/rs/scriptc/rs_graphics.rsh @@ -35,6 +35,10 @@ extern void __attribute__((overloadable)) rsgDrawSimpleMesh(rs_mesh ism, int sta extern void rsgClearColor(float, float, float, float); extern void rsgClearDepth(float); +extern void __attribute__((overloadable)) rsgDrawText(const char *, int x, int y); +extern void __attribute__((overloadable)) rsgDrawText(rs_allocation, int x, int y); +extern void rsgBindFont(rs_font); + /////////////////////////////////////////////////////// // misc extern void color(float, float, float, float); diff --git a/libs/rs/scriptc/rs_types.rsh b/libs/rs/scriptc/rs_types.rsh index 1d8f1bd..69e1aed 100644 --- a/libs/rs/scriptc/rs_types.rsh +++ b/libs/rs/scriptc/rs_types.rsh @@ -24,6 +24,7 @@ typedef struct { int* p; } __attribute__((packed, aligned(4))) rs_program_fragme typedef struct { int* p; } __attribute__((packed, aligned(4))) rs_program_vertex; typedef struct { int* p; } __attribute__((packed, aligned(4))) rs_program_raster; typedef struct { int* p; } __attribute__((packed, aligned(4))) rs_program_store; +typedef struct { int* p; } __attribute__((packed, aligned(4))) rs_font; typedef float float2 __attribute__((ext_vector_type(2))); typedef float float3 __attribute__((ext_vector_type(3))); |