summaryrefslogtreecommitdiffstats
path: root/driver/rsdRuntimeStubs.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-04-15 01:06:39 -0700
committerStephen Hines <srhines@google.com>2013-04-17 19:42:56 -0700
commitcca3d6ca444bef3b6d75431ec19bd07bfe40a733 (patch)
tree034159cbccbf4fa2ef6ba4b69faad0e2badc4e2a /driver/rsdRuntimeStubs.cpp
parent886e51b2ef45ce123379c8a11579851c5580d957 (diff)
downloadandroid_frameworks_rs-cca3d6ca444bef3b6d75431ec19bd07bfe40a733.tar.gz
android_frameworks_rs-cca3d6ca444bef3b6d75431ec19bd07bfe40a733.tar.bz2
android_frameworks_rs-cca3d6ca444bef3b6d75431ec19bd07bfe40a733.zip
Add support for DEBUG context type.
Bug: 7343201 This change adds switching for the debug runtime (libclcore_debug.bc) when running under a DEBUG RS context. It also fixes a small naming issue for rsSetElementAt_int(). Change-Id: I8b574c9ce915a440375530325ba7de2b46707cfd
Diffstat (limited to 'driver/rsdRuntimeStubs.cpp')
-rw-r--r--driver/rsdRuntimeStubs.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/driver/rsdRuntimeStubs.cpp b/driver/rsdRuntimeStubs.cpp
index 37c7b8d5..c22b966c 100644
--- a/driver/rsdRuntimeStubs.cpp
+++ b/driver/rsdRuntimeStubs.cpp
@@ -565,20 +565,20 @@ static void * ElementAt1D(Allocation *a, RsDataType dt, uint32_t vecSize, uint32
char buf[256];
if (x >= t->getLODDimX(0)) {
sprintf(buf, "Out range ElementAt X %i of %i", x, t->getLODDimX(0));
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (vecSize > 0) {
if (vecSize != e->getVectorSize()) {
sprintf(buf, "Vector size mismatch for ElementAt %i of %i", vecSize, e->getVectorSize());
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (dt != e->getType()) {
sprintf(buf, "Data type mismatch for ElementAt %i of %i", dt, e->getType());
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
}
@@ -596,26 +596,26 @@ static void * ElementAt2D(Allocation *a, RsDataType dt, uint32_t vecSize, uint32
char buf[256];
if (x >= t->getLODDimX(0)) {
sprintf(buf, "Out range ElementAt X %i of %i", x, t->getLODDimX(0));
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (y >= t->getLODDimY(0)) {
sprintf(buf, "Out range ElementAt Y %i of %i", y, t->getLODDimY(0));
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (vecSize > 0) {
if (vecSize != e->getVectorSize()) {
sprintf(buf, "Vector size mismatch for ElementAt %i of %i", vecSize, e->getVectorSize());
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (dt != e->getType()) {
sprintf(buf, "Data type mismatch for ElementAt %i of %i", dt, e->getType());
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
}
@@ -634,32 +634,32 @@ static void * ElementAt3D(Allocation *a, RsDataType dt, uint32_t vecSize, uint32
char buf[256];
if (x >= t->getLODDimX(0)) {
sprintf(buf, "Out range ElementAt X %i of %i", x, t->getLODDimX(0));
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (y >= t->getLODDimY(0)) {
sprintf(buf, "Out range ElementAt Y %i of %i", y, t->getLODDimY(0));
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (z >= t->getLODDimZ(0)) {
sprintf(buf, "Out range ElementAt Z %i of %i", z, t->getLODDimZ(0));
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (vecSize > 0) {
if (vecSize != e->getVectorSize()) {
sprintf(buf, "Vector size mismatch for ElementAt %i of %i", vecSize, e->getVectorSize());
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
if (dt != e->getType()) {
sprintf(buf, "Data type mismatch for ElementAt %i of %i", dt, e->getType());
- rsc->setError(RS_ERROR_FATAL_UNKNOWN, buf);
+ rsc->setError(RS_ERROR_FATAL_DEBUG, buf);
return NULL;
}
}
@@ -1008,7 +1008,7 @@ static RsdCpuReference::CpuSymbol gSyms[] = {
{ "_Z20rsSetElementAt_uint313rs_allocationPKDv3_jjjj", (void *)&SC_SetElementAt3_uint3, true },
{ "_Z20rsSetElementAt_uint413rs_allocationPKDv4_jjjj", (void *)&SC_SetElementAt3_uint4, true },
- { "_Z19rsSetElementAt_int13rs_allocationPKij", (void *)&SC_SetElementAt1_int, true },
+ { "_Z18rsSetElementAt_int13rs_allocationPKij", (void *)&SC_SetElementAt1_int, true },
{ "_Z19rsSetElementAt_int213rs_allocationPKDv2_ij", (void *)&SC_SetElementAt1_int2, true },
{ "_Z19rsSetElementAt_int313rs_allocationPKDv3_ij", (void *)&SC_SetElementAt1_int3, true },
{ "_Z19rsSetElementAt_int413rs_allocationPKDv4_ij", (void *)&SC_SetElementAt1_int4, true },