commit b693112b7513227b06d4a0a4e712ad3ce01451b4
author Jason Sams <rjsams@android.com> Mon May 02 16:29:42 2011 -0700
committer Jason Sams <rjsams@android.com> Mon May 02 16:29:42 2011 -0700
tree ed839dbc5033cdb547f5763c1648c9b5711d8b72
parent 0e4168caf7e94d98e44b21a1e519ca5bb6b25ea8

Try fixing auto data inlining again.

Change-Id: I95113db85551cbee774250eacb69553af1cf27bc

rsg_generator.c

diff --git a/rsg_generator.c b/rsg_generator.c
index 0e914fc..1d8b9b5 100644
--- a/rsg_generator.c
+++ b/rsg_generator.c
@@ -157,8 +157,7 @@
 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 @@
             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 @@
 
             //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++) {