summaryrefslogtreecommitdiff
path: root/libs/rs/rsAllocation.cpp
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-03-26 12:21:14 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-03-26 12:21:14 -0700
commit3cfae1bbf41e12fe2749c5f4a97507c19a8beb1b (patch)
treec3540cd52f2d3817dcb2b3d765b2823927b16bd8 /libs/rs/rsAllocation.cpp
parenta374d738b0136eb332afa783b2c1ae5cda510968 (diff)
parentf468700b6dd02cf68d4424567a8288a24084f51a (diff)
Merge "checkpoint animations"
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
-rw-r--r--libs/rs/rsAllocation.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index 4e8278d79840..e5ff1d743db6 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -170,6 +170,7 @@ void Allocation::uploadToTexture(const Context *rsc)
glGenerateMipmap(GL_TEXTURE_2D);
}
+ rsc->checkError("Allocation::uploadToTexture");
}
void Allocation::deferedUploadToBufferObject(const Context *rsc)
@@ -201,6 +202,7 @@ void Allocation::uploadToBufferObject(const Context *rsc)
glBindBuffer(GL_ARRAY_BUFFER, mBufferID);
glBufferData(GL_ARRAY_BUFFER, mType->getSizeBytes(), getPtr(), GL_DYNAMIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
+ rsc->checkError("Allocation::uploadToBufferObject");
}
void Allocation::uploadCheck(const Context *rsc)