commit 59b35f29cc576243a322bf88bc16063a9810da55
author Jason Sams <jsams@google.com> Tue Mar 17 12:59:17 2015 -0700
committer Jason Sams <jsams@google.com> Tue Mar 17 13:06:27 2015 -0700
tree 9777e37e0853ed75b8d6d206f0c4cbc6450f1c1d
parent 2ff43385c8563ecf8d81a421324ffff60930052a

Fix issues with >2D launches

mtls->fep was being passed to setup in place of per-thread fep.

Change-Id: Ic26154fcf47dc7bc70cec43f0daf023fb83dfd78

cpu_ref/rsCpuCore.cpp

diff --git a/cpu_ref/rsCpuCore.cpp b/cpu_ref/rsCpuCore.cpp
index f164517..696e2b6 100644
--- a/cpu_ref/rsCpuCore.cpp
+++ b/cpu_ref/rsCpuCore.cpp
@@ -376,16 +376,16 @@
     return n;
 }
 
-static bool SelectOuterSlice(MTLaunchStruct* mtls, uint32_t sliceNum) {
+static bool SelectOuterSlice(const MTLaunchStruct *mtls, RsExpandKernelDriverInfo* fep, uint32_t sliceNum) {
 
     uint32_t r = sliceNum;
-    r = sliceInt(&mtls->fep.current.z, r, mtls->start.z, mtls->end.z);
-    r = sliceInt(&mtls->fep.current.lod, r, mtls->start.lod, mtls->end.lod);
-    r = sliceInt(&mtls->fep.current.face, r, mtls->start.face, mtls->end.face);
-    r = sliceInt(&mtls->fep.current.array[0], r, mtls->start.array[0], mtls->end.array[0]);
-    r = sliceInt(&mtls->fep.current.array[1], r, mtls->start.array[1], mtls->end.array[1]);
-    r = sliceInt(&mtls->fep.current.array[2], r, mtls->start.array[2], mtls->end.array[2]);
-    r = sliceInt(&mtls->fep.current.array[3], r, mtls->start.array[3], mtls->end.array[3]);
+    r = sliceInt(&fep->current.z, r, mtls->start.z, mtls->end.z);
+    r = sliceInt(&fep->current.lod, r, mtls->start.lod, mtls->end.lod);
+    r = sliceInt(&fep->current.face, r, mtls->start.face, mtls->end.face);
+    r = sliceInt(&fep->current.array[0], r, mtls->start.array[0], mtls->end.array[0]);
+    r = sliceInt(&fep->current.array[1], r, mtls->start.array[1], mtls->end.array[1]);
+    r = sliceInt(&fep->current.array[2], r, mtls->start.array[2], mtls->end.array[2]);
+    r = sliceInt(&fep->current.array[3], r, mtls->start.array[3], mtls->end.array[3]);
     return r == 0;
 }
 
@@ -400,21 +400,20 @@
     while(1) {
         uint32_t slice = (uint32_t)__sync_fetch_and_add(&mtls->mSliceNum, 1);
 
-        if (!SelectOuterSlice(mtls, slice)) {
+        if (!SelectOuterSlice(mtls, &fep, slice)) {
             return;
         }
 
-        for (mtls->fep.current.y = mtls->start.y;
-             mtls->fep.current.y < mtls->end.y;
-             mtls->fep.current.y++) {
+        for (fep.current.y = mtls->start.y; fep.current.y < mtls->end.y;
+             fep.current.y++) {
 
-            FepPtrSetup(mtls, &mtls->fep, mtls->start.x,
-                        mtls->fep.current.y, mtls->fep.current.z, mtls->fep.current.lod,
-                        (RsAllocationCubemapFace)mtls->fep.current.face,
-                        mtls->fep.current.array[0], mtls->fep.current.array[1],
-                        mtls->fep.current.array[2], mtls->fep.current.array[3]);
+            FepPtrSetup(mtls, &fep, mtls->start.x,
+                        fep.current.y, fep.current.z, fep.current.lod,
+                        (RsAllocationCubemapFace)fep.current.face,
+                        fep.current.array[0], fep.current.array[1],
+                        fep.current.array[2], fep.current.array[3]);
 
-            fn(&mtls->fep, mtls->start.x, mtls->end.x, mtls->fep.outStride[0]);
+            fn(&fep, mtls->start.x, mtls->end.x, mtls->fep.outStride[0]);
         }
     }
 
@@ -538,7 +537,7 @@
         uint32_t slice = 0;
 
 
-        while(SelectOuterSlice(mtls, slice++)) {
+        while(SelectOuterSlice(mtls, &mtls->fep, slice++)) {
             for (mtls->fep.current.y = mtls->start.y;
                  mtls->fep.current.y < mtls->end.y;
                  mtls->fep.current.y++) {