commit f313dc32d5ea68a7c48fb4ec6e131ec2fb97ce2d
author Jason Sams <jsams@google.com> Tue Jul 09 14:29:39 2013 -0700
committer Jason Sams <jsams@google.com> Tue Jul 09 14:29:39 2013 -0700
tree 9309212ee75f350a9cf3b3589f71c7c33b75bc71
parent dc596dd105ad4b066a13f7450dae32d2bf56c5a6

Remove internal element builder and vector code.

Remove additional String8 references from shared includes.

Change-Id: Iede11384b9fc5a303d15d47fd4074c800dc6ad5f

rsProgram.cpp

diff --git a/rsProgram.cpp b/rsProgram.cpp
index 7114f29..806d1de 100644
--- a/rsProgram.cpp
+++ b/rsProgram.cpp
@@ -77,7 +77,9 @@
         shaderText += internalTokenLen;
         shaderLength -= internalTokenLen;
     }
-    mUserShader.setTo(shaderText, shaderLength);
+
+    mUserShader = rsuCopyString(shaderText, shaderLength);
+    mUserShaderLen = shaderLength;
 }
 
 Program::~Program() {
@@ -98,6 +100,12 @@
     mHal.state.inputElementsCount = 0;
     mHal.state.constantsCount = 0;
     mHal.state.texturesCount = 0;
+
+    if (mUserShader != NULL) {
+        delete[] mUserShader;
+        mUserShader = NULL;
+    }
+    mUserShaderLen = 0;
 }
 
 bool Program::freeChildren() {
@@ -134,6 +142,9 @@
     mConstants = NULL;
 
     mIsInternal = false;
+
+    mUserShader = NULL;
+    mUserShaderLen = 0;
 }
 
 void Program::bindAllocation(Context *rsc, Allocation *alloc, uint32_t slot) {