summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsAllocation.cpp
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2011-05-12 10:15:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-12 10:15:17 -0700
commit415c842aa6dd3cc797ed2ef1ae42351f594a6c74 (patch)
tree938ce71744d87aa03730d7fce22ca0243a369fa9 /libs/rs/rsAllocation.cpp
parente4ba346f0f1bb153ec1f9da5c0a4fc96c301efda (diff)
parent407cae950325682a56fe5373dd218a666da901ef (diff)
downloadframeworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.zip
frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.gz
frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.bz2
Merge "rsLib cleanup"
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
-rw-r--r--libs/rs/rsAllocation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index b5f6f56..5b84ca6 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -209,7 +209,7 @@ void Allocation::uploadToTexture(const Context *rsc) {
freeScriptMemory();
}
- rsc->checkError("Allocation::uploadToTexture");
+ //rsc->checkError("Allocation::uploadToTexture");
#endif //ANDROID_RS_SERIALIZE
}
@@ -334,7 +334,7 @@ void Allocation::uploadToBufferObject(const Context *rsc) {
glBindBuffer(target, mBufferID);
glBufferData(target, mHal.state.type->getSizeBytes(), getPtr(), GL_DYNAMIC_DRAW);
glBindBuffer(target, 0);
- rsc->checkError("Allocation::uploadToBufferObject");
+ //rsc->checkError("Allocation::uploadToBufferObject");
#endif //ANDROID_RS_SERIALIZE
}