commit 6847e73314e13aa02231268cca245a81eb0539ca
author Chris Wailes <chriswailes@google.com> Mon Aug 11 17:30:51 2014 -0700
committer Stephen Hines <srhines@google.com> Wed Aug 20 16:24:00 2014 -0700
tree 5e7ee3e65eb25bb10c73c776c9c55e488ab1f82e
parent 74f0b28d3314a21c26d8bb2dc06efb835d86bfcb

Replace android::String8 with std::string

Change-Id: I5b2b6d3e38afd0b040f0a584613745206bf01ba0

driver/rsdShaderCache.cpp

diff --git a/driver/rsdShaderCache.cpp b/driver/rsdShaderCache.cpp
index 9eb1631..0e36b49 100644
--- a/driver/rsdShaderCache.cpp
+++ b/driver/rsdShaderCache.cpp
@@ -38,9 +38,13 @@
     cleanupAll();
 }
 
-void RsdShaderCache::updateUniformArrayData(const Context *rsc, RsdShader *prog, uint32_t linkedID,
-                                         UniformData *data, const char* logTag,
-                                         UniformQueryData **uniformList, uint32_t uniListSize) {
+void RsdShaderCache::updateUniformArrayData(const Context *rsc,
+                                            RsdShader *prog,
+                                            uint32_t linkedID,
+                                            UniformData *data,
+                                            const char* logTag,
+                                            UniformQueryData **uniformList,
+                                            uint32_t uniListSize) {
 
     for (uint32_t ct=0; ct < prog->getUniformCount(); ct++) {
         if (data[ct].slot >= 0 && data[ct].arraySize > 1) {
@@ -55,14 +59,17 @@
 
         if (rsc->props.mLogShaders) {
              ALOGV("%s U, %s = %d, arraySize = %d\n", logTag,
-                  prog->getUniformName(ct).string(), data[ct].slot, data[ct].arraySize);
+                   prog->getUniformName(ct).c_str(), data[ct].slot,
+                   data[ct].arraySize);
         }
     }
 }
 
-void RsdShaderCache::populateUniformData(RsdShader *prog, uint32_t linkedID, UniformData *data) {
+void RsdShaderCache::populateUniformData(RsdShader *prog, uint32_t linkedID,
+                                         UniformData *data) {
     for (uint32_t ct=0; ct < prog->getUniformCount(); ct++) {
-       data[ct].slot = glGetUniformLocation(linkedID, prog->getUniformName(ct));
+       data[ct].slot = glGetUniformLocation(linkedID,
+                                            prog->getUniformName(ct).c_str());
        data[ct].arraySize = prog->getUniformArraySize(ct);
     }
 }
@@ -169,10 +176,12 @@
         }
 
         for (uint32_t ct=0; ct < e->vtxAttrCount; ct++) {
-            e->vtxAttrs[ct].slot = glGetAttribLocation(pgm, vtx->getAttribName(ct));
-            e->vtxAttrs[ct].name = vtx->getAttribName(ct).string();
+            e->vtxAttrs[ct].slot =
+                glGetAttribLocation(pgm, vtx->getAttribName(ct).c_str());
+            e->vtxAttrs[ct].name = vtx->getAttribName(ct).c_str();
             if (rsc->props.mLogShaders) {
-                ALOGV("vtx A %i, %s = %d\n", ct, vtx->getAttribName(ct).string(), e->vtxAttrs[ct].slot);
+                ALOGV("vtx A %i, %s = %d\n", ct,
+                      vtx->getAttribName(ct).c_str(), e->vtxAttrs[ct].slot);
             }
         }