summaryrefslogtreecommitdiff
path: root/rsScript.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-12-12 13:21:00 -0800
committerStephen Hines <srhines@google.com>2013-12-12 16:01:54 -0800
commitcadee38f6940e5584d3ec3398a21bd2a494361e2 (patch)
treea8dfc621fc02dc3161722d053292e0fab0153d67 /rsScript.cpp
parent386994b8c442dd1604aef6f202aa456d5ac7e93d (diff)
downloadrs-cadee38f6940e5584d3ec3398a21bd2a494361e2.tar.gz
Add missing functions and tests for support library.
Missing functions: rsFrac(float) rsMatrixLoadRotate(rs_matrix4x4 *, float, float, float, float) rsMatrixLoadScale(rs_matrix4x4 *, float, float, float) rsMatrixLoadTranslate(rs_matrix4x4 *, float, float, float) rsMatrixRotate(rs_matrix4x4 *, float, float, float, float) rsMatrixScale(rs_matrix4x4 *, float, float, float) rsMatrixTranslate(rs_matrix4x4 *, float, float, float) rsMatrixLoadOrtho(rs_matrix4x4 *, float, float, float, float, float, float) rsMatrixLoadFrustum(rs_matrix4x4 *, float, float, float, float, float, float) rsMatrixLoadPerspective(rs_matrix4x4 *, float, float, float, float) rsMatrixInverse(rs_matrix4x4 *) rsMatrixInverseTranspose(rs_matrix4x4 *) rsMatrixTranspose(rs_matrix4x4 *) rsMatrixTranspose(rs_matrix3x3 *) rsMatrixTranspose(rs_matrix2x2 *) rsUptimeNanos() rsGetDt() Headers tested in this CL: rs_element.rsh rs_math.rsh rs_matrix.rsh rs_object.rsh rs_sampler.rsh rs_time.rsh Change-Id: I6cb1972a44f66dc7fed8fe3cf0329720d166af81
Diffstat (limited to 'rsScript.cpp')
-rw-r--r--rsScript.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/rsScript.cpp b/rsScript.cpp
index 7857667c..a4a4e3ba 100644
--- a/rsScript.cpp
+++ b/rsScript.cpp
@@ -65,7 +65,8 @@ void Script::setVar(uint32_t slot, const void *val, size_t len) {
void Script::getVar(uint32_t slot, const void *val, size_t len) {
//ALOGE("getVar %i %p %i", slot, val, len);
if (slot >= mHal.info.exportedVariableCount) {
- ALOGE("Script::getVar unable to set allocation, invalid slot index");
+ ALOGE("Script::getVar unable to set allocation, invalid slot index: "
+ "%u >= %u", slot, mHal.info.exportedVariableCount);
return;
}
mRSC->mHal.funcs.script.getGlobalVar(mRSC, this, slot, (void *)val, len);
@@ -74,7 +75,8 @@ void Script::getVar(uint32_t slot, const void *val, size_t len) {
void Script::setVar(uint32_t slot, const void *val, size_t len, Element *e,
const size_t *dims, size_t dimLen) {
if (slot >= mHal.info.exportedVariableCount) {
- ALOGE("Script::setVar unable to set allocation, invalid slot index");
+ ALOGE("Script::setVar unable to set allocation, invalid slot index: "
+ "%u >= %u", slot, mHal.info.exportedVariableCount);
return;
}
mRSC->mHal.funcs.script.setGlobalVarWithElemDims(mRSC, this, slot,
@@ -84,7 +86,8 @@ void Script::setVar(uint32_t slot, const void *val, size_t len, Element *e,
void Script::setVarObj(uint32_t slot, ObjectBase *val) {
//ALOGE("setVarObj %i %p", slot, val);
if (slot >= mHal.info.exportedVariableCount) {
- ALOGE("Script::setVarObj unable to set allocation, invalid slot index");
+ ALOGE("Script::setVarObj unable to set allocation, invalid slot index: "
+ "%u >= %u", slot, mHal.info.exportedVariableCount);
return;
}
mHasObjectSlots = true;