commit 93d6bc872b7d9fba63abfa7513d56b38d9c3d371
author Chris Wailes <chriswailes@google.com> Mon Jul 28 16:54:38 2014 -0700
committer Chris Wailes <chriswailes@google.com> Mon Aug 18 15:12:32 2014 -0700
tree 0a99fbd58c3254f82ffa1600f653aeac81c55d03
parent 70d4971878444fe7cf4263998b0c3f46e2b6c71f

Replaced android::Vector with std::vector.

Change-Id: I4c6abd964dc4b1412ec2e592fc8e835fecfe53f6

driver/rsdShaderCache.h

diff --git a/driver/rsdShaderCache.h b/driver/rsdShaderCache.h
index 6de1d63..e782fe5 100644
--- a/driver/rsdShaderCache.h
+++ b/driver/rsdShaderCache.h
@@ -17,6 +17,9 @@
 #ifndef ANDROID_RSD_SHADER_CACHE_H
 #define ANDROID_RSD_SHADER_CACHE_H
 
+#include <string>
+#include <vector>
+
 namespace android {
 namespace renderscript {
 
@@ -27,7 +30,6 @@
 
 #if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
 #include <utils/String8.h>
-#include <utils/Vector.h>
 #else
 #include "rsUtils.h"
 #endif
@@ -58,7 +60,7 @@
 
     void cleanupAll();
 
-    int32_t vtxAttribSlot(const android::String8 &attrName) const;
+    int32_t vtxAttribSlot(const std::string &attrName) const;
     int32_t vtxUniformSlot(uint32_t a) const {return mCurrent->vtxUniforms[a].slot;}
     uint32_t vtxUniformSize(uint32_t a) const {return mCurrent->vtxUniforms[a].arraySize;}
     int32_t fragUniformSlot(uint32_t a) const {return mCurrent->fragUniforms[a].slot;}
@@ -143,7 +145,7 @@
         UniformData *fragUniforms;
         bool *fragUniformIsSTO;
     };
-    android::Vector<ProgramEntry*> mEntries;
+    std::vector<ProgramEntry*> mEntries;
     ProgramEntry *mCurrent;
 
     bool hasArrayUniforms(RsdShader *vtx, RsdShader *frag);
@@ -156,7 +158,3 @@
 
 
 #endif //ANDROID_RSD_SHADER_CACHE_H
-
-
-
-