Detect use of RS objects in kernels to disable a ScriptGroup optimization.
Bug: 10394865
This change disables a ScriptGroup optimization when we can't guarantee
that there is no implicit ordering between two kernels. In this case, it
is possible to communicate between kernels using the same bound global
RS object (like Allocation). A subsequent kernel in the ScriptGroup could
accidentally pick up stale data, leading to incorrect results.
Now, we disable this optimization whenever we see binds/sets of variables
that are potentiall RS object types for a given Script/kernel. This is
overly conservative, but sufficient for now.
This change also fixes a small issue with preLaunch/postLaunch missing for
the default ScriptGroup execution case.
Change-Id: I0d19d200cc8dc397d68008a4df6ea423b1e4d04f
diff --git a/rsScript.h b/rsScript.h
index c868aaa..ce4878a 100644
--- a/rsScript.h
+++ b/rsScript.h
@@ -119,8 +119,13 @@
virtual void Invoke(Context *rsc, uint32_t slot, const void *data, size_t len) = 0;
virtual void setupScript(Context *rsc) = 0;
virtual uint32_t run(Context *) = 0;
+
+ bool hasObjectSlots() const {
+ return mHasObjectSlots;
+ }
protected:
bool mInitialized;
+ bool mHasObjectSlots;
ObjectBaseRef<Allocation> *mSlots;
ObjectBaseRef<const Type> *mTypes;
