diff options
| author | Jason Sams <jsams@google.com> | 2012-02-10 15:27:26 -0800 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2012-02-10 15:27:26 -0800 |
| commit | b2a5354f0c91f6b5c6567c8226f26064ed045788 (patch) | |
| tree | b867fab535dfc41f3d99182d4b079e5041cd938c | |
| parent | c6253d501f8d9a39439c9a450697023e93013c43 (diff) | |
| parent | cb66aec0bdd3248c526c3a1113936576a30286cb (diff) | |
| download | frameworks_base-b2a5354f0c91f6b5c6567c8226f26064ed045788.zip frameworks_base-b2a5354f0c91f6b5c6567c8226f26064ed045788.tar.gz frameworks_base-b2a5354f0c91f6b5c6567c8226f26064ed045788.tar.bz2 | |
resolved conflicts for merge of cb66aec0 to graphics-dev
Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
| -rw-r--r-- | libs/rs/rsAllocation.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/rs/rsAllocation.h b/libs/rs/rsAllocation.h index 6838759..58a582b 100644 --- a/libs/rs/rsAllocation.h +++ b/libs/rs/rsAllocation.h @@ -55,9 +55,8 @@ public: bool hasMipmaps; bool hasFaces; bool hasReferences; - int32_t surfaceTextureID; - void * usrPtr; + int32_t surfaceTextureID; }; State state; |