diff options
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 35d812d40f25..7b92b39a9981 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -75,7 +75,7 @@ void Allocation::data(Context *rsc, uint32_t xoff, uint32_t lod, const uint32_t eSize = mHal.state.type->getElementSizeBytes(); if ((count * eSize) != sizeBytes) { - LOGE("Allocation::subData called with mismatched size expected %i, got %i", + ALOGE("Allocation::subData called with mismatched size expected %i, got %i", (count * eSize), sizeBytes); mHal.state.type->dumpLOGV("type info"); return; @@ -90,10 +90,10 @@ void Allocation::data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t lod, const uint32_t eSize = mHal.state.elementSizeBytes; const uint32_t lineSize = eSize * w; - //LOGE("data2d %p, %i %i %i %i %i %i %p %i", this, xoff, yoff, lod, face, w, h, data, sizeBytes); + //ALOGE("data2d %p, %i %i %i %i %i %i %p %i", this, xoff, yoff, lod, face, w, h, data, sizeBytes); if ((lineSize * h) != sizeBytes) { - LOGE("Allocation size mismatch, expected %i, got %i", (lineSize * h), sizeBytes); + ALOGE("Allocation size mismatch, expected %i, got %i", (lineSize * h), sizeBytes); rsAssert(!"Allocation::subData called with mismatched size"); return; } @@ -112,20 +112,20 @@ void Allocation::elementData(Context *rsc, uint32_t x, const void *data, uint32_t eSize = mHal.state.elementSizeBytes; if (cIdx >= mHal.state.type->getElement()->getFieldCount()) { - LOGE("Error Allocation::subElementData component %i out of range.", cIdx); + ALOGE("Error Allocation::subElementData component %i out of range.", cIdx); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData component out of range."); return; } if (x >= mHal.state.dimensionX) { - LOGE("Error Allocation::subElementData X offset %i out of range.", x); + ALOGE("Error Allocation::subElementData X offset %i out of range.", x); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData X offset out of range."); return; } const Element * e = mHal.state.type->getElement()->getField(cIdx); if (sizeBytes != e->getSizeBytes()) { - LOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes()); + ALOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes()); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size."); return; } @@ -139,19 +139,19 @@ void Allocation::elementData(Context *rsc, uint32_t x, uint32_t y, uint32_t eSize = mHal.state.elementSizeBytes; if (x >= mHal.state.dimensionX) { - LOGE("Error Allocation::subElementData X offset %i out of range.", x); + ALOGE("Error Allocation::subElementData X offset %i out of range.", x); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData X offset out of range."); return; } if (y >= mHal.state.dimensionY) { - LOGE("Error Allocation::subElementData X offset %i out of range.", x); + ALOGE("Error Allocation::subElementData X offset %i out of range.", x); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData X offset out of range."); return; } if (cIdx >= mHal.state.type->getElement()->getFieldCount()) { - LOGE("Error Allocation::subElementData component %i out of range.", cIdx); + ALOGE("Error Allocation::subElementData component %i out of range.", cIdx); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData component out of range."); return; } @@ -159,7 +159,7 @@ void Allocation::elementData(Context *rsc, uint32_t x, uint32_t y, const Element * e = mHal.state.type->getElement()->getField(cIdx); if (sizeBytes != e->getSizeBytes()) { - LOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes()); + ALOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes()); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size."); return; } @@ -217,7 +217,7 @@ Allocation *Allocation::createFromStream(Context *rsc, IStream *stream) { // First make sure we are reading the correct object RsA3DClassID classID = (RsA3DClassID)stream->loadU32(); if (classID != RS_A3D_CLASS_ID_ALLOCATION) { - LOGE("allocation loading skipped due to invalid class id\n"); + ALOGE("allocation loading skipped due to invalid class id\n"); return NULL; } @@ -233,7 +233,7 @@ Allocation *Allocation::createFromStream(Context *rsc, IStream *stream) { // Number of bytes we wrote out for this allocation uint32_t dataSize = stream->loadU32(); if (dataSize != type->getSizeBytes()) { - LOGE("failed to read allocation because numbytes written is not the same loaded type wants\n"); + ALOGE("failed to read allocation because numbytes written is not the same loaded type wants\n"); ObjectBase::checkDelete(type); return NULL; } @@ -319,7 +319,7 @@ void Allocation::resize1D(Context *rsc, uint32_t dimX) { } void Allocation::resize2D(Context *rsc, uint32_t dimX, uint32_t dimY) { - LOGE("not implemented"); + ALOGE("not implemented"); } ///////////////// @@ -497,7 +497,7 @@ RsAllocation rsi_AllocationCreateFromBitmap(Context *rsc, RsType vtype, RsAllocation vTexAlloc = rsi_AllocationCreateTyped(rsc, vtype, mips, usages); Allocation *texAlloc = static_cast<Allocation *>(vTexAlloc); if (texAlloc == NULL) { - LOGE("Memory allocation failure"); + ALOGE("Memory allocation failure"); return NULL; } @@ -521,7 +521,7 @@ RsAllocation rsi_AllocationCubeCreateFromBitmap(Context *rsc, RsType vtype, RsAllocation vTexAlloc = rsi_AllocationCreateTyped(rsc, vtype, mips, usages); Allocation *texAlloc = static_cast<Allocation *>(vTexAlloc); if (texAlloc == NULL) { - LOGE("Memory allocation failure"); + ALOGE("Memory allocation failure"); return NULL; } |