Merge "DO NOT MERGE - Add Sampler custom alloc/delete"tools_r22.2

2 files changed, 17 insertions, 1 deletions

diff --git a/rsSampler.cpp b/rsSampler.cpp
index fededb18..2a8476a0 100644
--- a/rsSampler.cpp
+++ b/rsSampler.cpp
@@ -98,7 +98,13 @@ ObjectBaseRef<Sampler> Sampler::getSampler(Context *rsc,
     }
     ObjectBase::asyncUnlock();
 
-    Sampler *s = new Sampler(rsc, magFilter, minFilter, wrapS, wrapT, wrapR, aniso);
+    void* allocMem = rsc->mHal.funcs.allocRuntimeMem(sizeof(Sampler), 0);
+    if (!allocMem) {
+        rsc->setError(RS_ERROR_FATAL_DRIVER, "Couldn't allocate memory for Allocation");
+        return NULL;
+    }
+
+    Sampler *s = new (allocMem) Sampler(rsc, magFilter, minFilter, wrapS, wrapT, wrapR, aniso);
     returnRef.set(s);
 
     ObjectBase::asyncLock();
@@ -108,6 +114,14 @@ ObjectBaseRef<Sampler> Sampler::getSampler(Context *rsc,
     return returnRef;
 }
 
+void Sampler::operator delete(void* ptr) {
+    if (ptr) {
+        Sampler *s = (Sampler*) ptr;
+        s->getContext()->mHal.funcs.freeRuntimeMem(ptr);
+    }
+}
+
+
 ////////////////////////////////
 
 namespace android {
diff --git a/rsSampler.h b/rsSampler.h
index 81220a88..2fdf7073 100644
--- a/rsSampler.h
+++ b/rsSampler.h
@@ -51,6 +51,8 @@ public:
     };
     Hal mHal;
 
+    void operator delete(void* ptr);
+
     static ObjectBaseRef<Sampler> getSampler(Context *,
                                              RsSamplerValue magFilter,
                                              RsSamplerValue minFilter,