Adding nvidia extension for limited npot support.

Updating a3d loading to be async.

Change-Id: I4be71d2002b9ad6ab8896d63e625f031e6b7ea6c

1 files changed, 6 insertions, 7 deletions

diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index b4872e3dbb78..b74fa8ef3492 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -816,7 +816,12 @@ void rsi_AllocationResize2D(Context *rsc, RsAllocation va, uint32_t dimX, uint32
     a->resize2D(rsc, dimX, dimY);
 }
 
-const void* rsi_AllocationGetType(Context *rsc, RsAllocation va)
+#endif //ANDROID_RS_BUILD_FOR_HOST
+
+}
+}
+
+const void * rsaAllocationGetType(RsContext con, RsAllocation va)
 {
     Allocation *a = static_cast<Allocation *>(va);
     a->getType()->incUserRef();
@@ -824,11 +829,6 @@ const void* rsi_AllocationGetType(Context *rsc, RsAllocation va)
     return a->getType();
 }
 
-#endif //ANDROID_RS_BUILD_FOR_HOST
-
-}
-}
-
 RsAllocation rsaAllocationCreateTyped(RsContext con, RsType vtype)
 {
     Context *rsc = static_cast<Context *>(con);
@@ -873,4 +873,3 @@ RsAllocation rsaAllocationCreateFromBitmap(RsContext con, uint32_t w, uint32_t h
 
     return texAlloc;
 }
-