summaryrefslogtreecommitdiff
path: root/rsFont.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2010-09-28 15:45:45 -0700
committerStephen Hines <srhines@google.com>2010-09-29 16:58:17 -0700
commit01b7d2995f9cbd33a9ccdf861fe959743a4b9954 (patch)
tree5a99b0f12927df4eb9677252e6738cfb853f88ec /rsFont.cpp
parent886f11ade9dde05485cb11c0d67d87f76a428f6c (diff)
downloadrs-01b7d2995f9cbd33a9ccdf861fe959743a4b9954.tar.gz
Fix clear() operation for rsScriptC.
- This removes a memory leak where some elements were not getting tracked properly (and then triggering an assert when a context is destroyed). - Convert ScriptCState to use a tracked object reference for mScript. - Add a missing clear to FontState. - Clean up synchronization in RSTest so that our graphics context outlives any subtest context. Change-Id: I0d5768c4d2f8810dd1ae2f68b1edd7e150f382fd
Diffstat (limited to 'rsFont.cpp')
-rw-r--r--rsFont.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/rsFont.cpp b/rsFont.cpp
index 4f8d8df0..12dedac9 100644
--- a/rsFont.cpp
+++ b/rsFont.cpp
@@ -743,6 +743,8 @@ void FontState::deinit(Context *rsc)
{
mInitialized = false;
+ mFontShaderFConstant.clear();
+
mIndexBuffer.clear();
mVertexArray.clear();