summaryrefslogtreecommitdiffstats
path: root/libs/rs/RenderScript.h
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2011-01-07 11:12:08 -0800
committerAlex Sakhartchouk <alexst@google.com>2011-01-07 11:16:08 -0800
commitb0253ea6969bdd27bf574e0da7fa91aa6d09f44f (patch)
tree2c2c89870052eb05e3d150d8710c7df4d1f3646a /libs/rs/RenderScript.h
parent60525c824ccf11302a9b8343e72eba259485edea (diff)
downloadframeworks_base-b0253ea6969bdd27bf574e0da7fa91aa6d09f44f.zip
frameworks_base-b0253ea6969bdd27bf574e0da7fa91aa6d09f44f.tar.gz
frameworks_base-b0253ea6969bdd27bf574e0da7fa91aa6d09f44f.tar.bz2
Additional loading methods for fonts and a3d files.
Cleaned up error messages. Change-Id: Id33b7149671df23c37cc11375d844a7837dac750 Change-Id: I6663ce54f7b9bbaf285935ca658d93ba417f8179
Diffstat (limited to 'libs/rs/RenderScript.h')
-rw-r--r--libs/rs/RenderScript.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h
index 87758e5..f160ef1 100644
--- a/libs/rs/RenderScript.h
+++ b/libs/rs/RenderScript.h
@@ -334,7 +334,9 @@ typedef struct {
// A3D loading and object update code.
// Should only be called at object creation, not thread safe
RsObjectBase rsaFileA3DGetEntryByIndex(RsContext, uint32_t idx, RsFile);
-RsFile rsaFileA3DCreateFromAssetStream(RsContext, const void *data, uint32_t len);
+RsFile rsaFileA3DCreateFromMemory(RsContext, const void *data, uint32_t len);
+RsFile rsaFileA3DCreateFromAsset(RsContext, void *asset);
+RsFile rsaFileA3DCreateFromFile(RsContext, const char *path);
void rsaFileA3DGetNumIndexEntries(RsContext, int32_t *numEntries, RsFile);
void rsaFileA3DGetIndexEntries(RsContext, RsFileIndexEntry *fileEntries,uint32_t numEntries, RsFile);
void rsaGetName(RsContext, void * obj, const char **name);