diff options
| author | Jason Sams <rjsams@android.com> | 2011-05-03 14:52:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-03 14:52:22 -0700 |
| commit | 629b565162d4a0e27c20303a7ce37b6815a8f1ff (patch) | |
| tree | 7f24bc45626f70fbddcdfda72b40f72fd14bafef /libs/rs | |
| parent | ceae02e2c728155943e5ad686d562817b3d7f3fd (diff) | |
| parent | b96e9517affa31c2f9b5c8c005c85d2cc99453b4 (diff) | |
| download | frameworks_base-629b565162d4a0e27c20303a7ce37b6815a8f1ff.zip frameworks_base-629b565162d4a0e27c20303a7ce37b6815a8f1ff.tar.gz frameworks_base-629b565162d4a0e27c20303a7ce37b6815a8f1ff.tar.bz2 | |
Merge "Try fixing auto data inlining again."
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/rsg_generator.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libs/rs/rsg_generator.c b/libs/rs/rsg_generator.c index 0e914fc..1d8b9b5 100644 --- a/libs/rs/rsg_generator.c +++ b/libs/rs/rsg_generator.c @@ -157,8 +157,7 @@ void printPlaybackFuncs(FILE *f, const char *prefix) { static int hasInlineDataPointers(const ApiEntry * api) { int ret = 0; int ct; - // Temporarly disable inbanding while we sort though the bugs. - if (1|| api->sync || api->ret.typeName[0]) { + if (api->sync || api->ret.typeName[0]) { return 0; } for (ct=0; ct < api->paramCount; ct++) { @@ -229,7 +228,7 @@ void printApiCpp(FILE *f) { fprintf(f, ");\n"); } else { fprintf(f, " ThreadIO *io = &((Context *)rsc)->mIO;\n"); - fprintf(f, " uint32_t size = sizeof(RS_CMD_%s);\n", api->name); + fprintf(f, " const uint32_t size = sizeof(RS_CMD_%s);\n", api->name); if (hasInlineDataPointers(api)) { fprintf(f, " uint32_t dataSize = 0;\n"); for (ct2=0; ct2 < api->paramCount; ct2++) { @@ -242,10 +241,15 @@ void printApiCpp(FILE *f) { //fprintf(f, " LOGE(\"add command %s\\n\");\n", api->name); if (hasInlineDataPointers(api)) { - fprintf(f, " RS_CMD_%s *cmd = static_cast<RS_CMD_%s *>(io->mToCore.reserve(dataSize + sizeof(RS_CMD_%s)));\n", api->name, api->name, api->name); + fprintf(f, " RS_CMD_%s *cmd = NULL;\n", api->name); + fprintf(f, " if (dataSize < 1024) {;\n"); + fprintf(f, " cmd = static_cast<RS_CMD_%s *>(io->mToCore.reserve(dataSize + size));\n", api->name); + fprintf(f, " } else {\n"); + fprintf(f, " cmd = static_cast<RS_CMD_%s *>(io->mToCore.reserve(size));\n", api->name); + fprintf(f, " }\n"); fprintf(f, " uint8_t *payload = (uint8_t *)&cmd[1];\n"); } else { - fprintf(f, " RS_CMD_%s *cmd = static_cast<RS_CMD_%s *>(io->mToCore.reserve(sizeof(RS_CMD_%s)));\n", api->name, api->name, api->name); + fprintf(f, " RS_CMD_%s *cmd = static_cast<RS_CMD_%s *>(io->mToCore.reserve(size));\n", api->name, api->name); } for (ct2=0; ct2 < api->paramCount; ct2++) { |