From cadee38f6940e5584d3ec3398a21bd2a494361e2 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Thu, 12 Dec 2013 13:21:00 -0800 Subject: 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 --- rsScript.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'rsScript.cpp') 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; -- cgit v1.2.3