commit 532efd3ce261f9901bfa51d37377069fe6e8ccdf
author Jason Sams <rjsams@android.com> Fri Feb 10 13:24:18 2012 -0800
committer Jason Sams <rjsams@android.com> Fri Feb 10 13:24:18 2012 -0800
tree bd76cb870aa11a0a906de323e3d75b594fd4b93b
parent d51280f10bb06a2d7abb8bd2980415733673c88b

Start implementing SurfaceTexture streaming into RS allocations.

Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b

Conflicts:

	libs/rs/rsAllocation.h

libs/rs/rsAllocation.h

diff --git a/libs/rs/rsAllocation.h b/libs/rs/rsAllocation.h
index 20201ca..a26d835 100644
--- a/libs/rs/rsAllocation.h
+++ b/libs/rs/rsAllocation.h
@@ -55,6 +55,8 @@
             bool hasMipmaps;
             bool hasFaces;
             bool hasReferences;
+            void * usrPtr;
+            int32_t surfaceTextureID;
         };
         State state;
 
@@ -123,6 +125,7 @@
         return mHal.state.mipmapControl != RS_ALLOCATION_MIPMAP_NONE;
     }
 
+    int32_t getSurfaceTextureID(const Context *rsc);
 
 protected:
     Vector<const Program *> mToDirtyList;