aboutsummaryrefslogtreecommitdiffstats
path: root/emulator
diff options
context:
space:
mode:
authorVince Harron <vharron@google.com>2014-10-30 16:03:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-30 16:03:03 +0000
commit66e92a93484e7c70f4dc5458538e7b4616dc4de1 (patch)
tree5ad060b1fd729d0537337ebcdbff80ef05c76f2f /emulator
parent4996c7ef8ea7eb7c0aace6348052db0dc0aee42d (diff)
parenta829d501fa16bdbdcfb85dfcff88c37dbcfac956 (diff)
downloadsdk-66e92a93484e7c70f4dc5458538e7b4616dc4de1.zip
sdk-66e92a93484e7c70f4dc5458538e7b4616dc4de1.tar.gz
sdk-66e92a93484e7c70f4dc5458538e7b4616dc4de1.tar.bz2
Merge "Properly reset source code buffer" into studio-1.0-dev
automerge: a829d50 * commit 'a829d501fa16bdbdcfb85dfcff88c37dbcfac956': Properly reset source code buffer
Diffstat (limited to 'emulator')
-rw-r--r--emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp b/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp
index 940538a..9bbedbf 100644
--- a/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp
+++ b/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp
@@ -36,6 +36,7 @@ ShaderParser::ShaderParser(GLenum type):ObjectData(SHADER_DATA),
};
void ShaderParser::setSrc(const Version& ver,GLsizei count,const GLchar** strings,const GLint* length){
+ m_src.clear();
for(int i = 0;i<count;i++){
m_src.append(strings[i]);
}