am f8594739: am de68eb69: Merge "Support new-style kernels with no output and no input."

* commit 'f8594739fcfbce7e35d3705f8df1577abb00d516':
  Support new-style kernels with no output and no input.

1 files changed, 27 insertions, 22 deletions

diff --git a/slang_rs_reflection.cpp b/slang_rs_reflection.cpp
index dfa6e75..f1d9d3d 100644
--- a/slang_rs_reflection.cpp
+++ b/slang_rs_reflection.cpp
@@ -692,17 +692,18 @@ void RSReflectionJava::genExportForEach(const RSExportForEach *EF) {
 
   // forEach_*()
   ArgTy Args;
-
-  slangAssert(EF->getNumParameters() > 0 || EF->hasReturn());
+  bool HasAllocation = false; // at least one in/out allocation?
 
   const RSExportForEach::InVec     &Ins     = EF->getIns();
   const RSExportForEach::InTypeVec &InTypes = EF->getInTypes();
   const RSExportType               *OET     = EF->getOutType();
 
   if (Ins.size() == 1) {
+    HasAllocation = true;
     Args.push_back(std::make_pair("Allocation", "ain"));
 
   } else if (Ins.size() > 1) {
+    HasAllocation = true;
     for (RSExportForEach::InIter BI = Ins.begin(), EI = Ins.end(); BI != EI;
          BI++) {
 
@@ -711,8 +712,10 @@ void RSReflectionJava::genExportForEach(const RSExportForEach *EF) {
     }
   }
 
-  if (EF->hasOut() || EF->hasReturn())
+  if (EF->hasOut() || EF->hasReturn()) {
+    HasAllocation = true;
     Args.push_back(std::make_pair("Allocation", "aout"));
+  }
 
   const RSExportRecordType *ERT = EF->getParamPacketType();
   if (ERT) {
@@ -737,34 +740,36 @@ void RSReflectionJava::genExportForEach(const RSExportForEach *EF) {
   }
 
   if (mRSContext->getTargetAPI() >= SLANG_JB_MR2_TARGET_API) {
-    startFunction(AM_Public, false, "void", "forEach_" + EF->getName(), Args);
+    if (HasAllocation) {
+      startFunction(AM_Public, false, "void", "forEach_" + EF->getName(), Args);
 
-    mOut.indent() << "forEach_" << EF->getName();
-    mOut << "(";
+      mOut.indent() << "forEach_" << EF->getName();
+      mOut << "(";
 
-    if (Ins.size() == 1) {
-      mOut << "ain, ";
+      if (Ins.size() == 1) {
+        mOut << "ain, ";
 
-    } else if (Ins.size() > 1) {
-      for (RSExportForEach::InIter BI = Ins.begin(), EI = Ins.end(); BI != EI;
-           BI++) {
+      } else if (Ins.size() > 1) {
+        for (RSExportForEach::InIter BI = Ins.begin(), EI = Ins.end(); BI != EI;
+             BI++) {
 
-        mOut << "ain_" << (*BI)->getName().str() << ", ";
+          mOut << "ain_" << (*BI)->getName().str() << ", ";
+        }
       }
-    }
 
-    if (EF->hasOut() || EF->hasReturn()) {
-      mOut << "aout, ";
-    }
+      if (EF->hasOut() || EF->hasReturn()) {
+        mOut << "aout, ";
+      }
 
-    if (EF->hasUsrData()) {
-      mOut << Args.back().second << ", ";
-    }
+      if (EF->hasUsrData()) {
+        mOut << Args.back().second << ", ";
+      }
 
-    // No clipped bounds to pass in.
-    mOut << "null);\n";
+      // No clipped bounds to pass in.
+      mOut << "null);\n";
 
-    endFunction();
+      endFunction();
+    }
 
     // Add the clipped kernel parameters to the Args list.
     Args.push_back(std::make_pair("Script.LaunchOptions", "sc"));