Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
diff --git a/driver/rsdAllocation.cpp b/driver/rsdAllocation.cpp
index 2ebfe0a..e79cd0f 100644
--- a/driver/rsdAllocation.cpp
+++ b/driver/rsdAllocation.cpp
@@ -256,7 +256,7 @@
if (drv->bufferID) {
// Causes a SW crash....
- //LOGV(" mBufferID %i", mBufferID);
+ //ALOGV(" mBufferID %i", mBufferID);
//glDeleteBuffers(1, &mBufferID);
//mBufferID = 0;
}
diff --git a/driver/rsdBcc.cpp b/driver/rsdBcc.cpp
index 4ecf8e8..c16091c 100644
--- a/driver/rsdBcc.cpp
+++ b/driver/rsdBcc.cpp
@@ -450,7 +450,7 @@
int32_t *destPtr = ((int32_t **)drv->mFieldAddress)[slot];
if (!destPtr) {
- //LOGV("Calling setVar on slot = %i which is null", slot);
+ //ALOGV("Calling setVar on slot = %i which is null", slot);
return;
}
@@ -464,7 +464,7 @@
int32_t *destPtr = ((int32_t **)drv->mFieldAddress)[slot];
if (!destPtr) {
- //LOGV("Calling setVar on slot = %i which is null", slot);
+ //ALOGV("Calling setVar on slot = %i which is null", slot);
return;
}
@@ -478,7 +478,7 @@
int32_t *destPtr = ((int32_t **)drv->mFieldAddress)[slot];
if (!destPtr) {
- //LOGV("Calling setVar on slot = %i which is null", slot);
+ //ALOGV("Calling setVar on slot = %i which is null", slot);
return;
}
diff --git a/driver/rsdCore.cpp b/driver/rsdCore.cpp
index 247f4dc..9292fa1 100644
--- a/driver/rsdCore.cpp
+++ b/driver/rsdCore.cpp
@@ -139,7 +139,7 @@
uint32_t idx = (uint32_t)android_atomic_inc(&dc->mWorkers.mLaunchCount);
- //LOGV("RS helperThread starting %p idx=%i", rsc, idx);
+ //ALOGV("RS helperThread starting %p idx=%i", rsc, idx);
dc->mWorkers.mLaunchSignals[idx].init();
dc->mWorkers.mNativeThreadId[idx] = gettid();
@@ -168,7 +168,7 @@
dc->mWorkers.mCompleteSignal.set();
}
- //LOGV("RS helperThread exited %p idx=%i", rsc, idx);
+ //ALOGV("RS helperThread exited %p idx=%i", rsc, idx);
return NULL;
}
@@ -219,7 +219,7 @@
int cpu = sysconf(_SC_NPROCESSORS_ONLN);
- LOGV("%p Launching thread(s), CPUs %i", rsc, cpu);
+ ALOGV("%p Launching thread(s), CPUs %i", rsc, cpu);
if (cpu < 2) cpu = 0;
dc->mWorkers.mCount = (uint32_t)cpu;
diff --git a/driver/rsdGL.cpp b/driver/rsdGL.cpp
index 98d9486..d4deefb 100644
--- a/driver/rsdGL.cpp
+++ b/driver/rsdGL.cpp
@@ -101,7 +101,7 @@
EGLint value = -1;
EGLBoolean returnVal = eglGetConfigAttrib(dpy, config, names[j].attribute, &value);
if (returnVal) {
- LOGV(" %s: %d (0x%x)", names[j].name, value, value);
+ ALOGV(" %s: %d (0x%x)", names[j].name, value, value);
}
}
}
@@ -116,12 +116,12 @@
LOGE(" GL Extensions: %s", dc->gl.gl.extensions);
LOGE(" GL int Versions %i %i", dc->gl.gl.majorVersion, dc->gl.gl.minorVersion);
- LOGV("MAX Textures %i, %i %i", dc->gl.gl.maxVertexTextureUnits,
+ ALOGV("MAX Textures %i, %i %i", dc->gl.gl.maxVertexTextureUnits,
dc->gl.gl.maxFragmentTextureImageUnits, dc->gl.gl.maxTextureImageUnits);
- LOGV("MAX Attribs %i", dc->gl.gl.maxVertexAttribs);
- LOGV("MAX Uniforms %i, %i", dc->gl.gl.maxVertexUniformVectors,
+ ALOGV("MAX Attribs %i", dc->gl.gl.maxVertexAttribs);
+ ALOGV("MAX Uniforms %i, %i", dc->gl.gl.maxVertexUniformVectors,
dc->gl.gl.maxFragmentUniformVectors);
- LOGV("MAX Varyings %i", dc->gl.gl.maxVaryingVectors);
+ ALOGV("MAX Varyings %i", dc->gl.gl.maxVaryingVectors);
}
void rsdGLShutdown(const Context *rsc) {
@@ -199,7 +199,7 @@
configAttribsPtr[0] = EGL_NONE;
rsAssert(configAttribsPtr < (configAttribs + (sizeof(configAttribs) / sizeof(EGLint))));
- LOGV("%p initEGL start", rsc);
+ ALOGV("%p initEGL start", rsc);
rsc->setWatchdogGL("eglGetDisplay", __LINE__, __FILE__);
dc->gl.egl.display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
checkEglError("eglGetDisplay");
@@ -303,11 +303,11 @@
dc->gl.gl.renderer = glGetString(GL_RENDERER);
dc->gl.gl.extensions = glGetString(GL_EXTENSIONS);
- //LOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion);
- //LOGV("GL Version %s", mGL.mVersion);
- //LOGV("GL Vendor %s", mGL.mVendor);
- //LOGV("GL Renderer %s", mGL.mRenderer);
- //LOGV("GL Extensions %s", mGL.mExtensions);
+ //ALOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion);
+ //ALOGV("GL Version %s", mGL.mVersion);
+ //ALOGV("GL Vendor %s", mGL.mVendor);
+ //ALOGV("GL Renderer %s", mGL.mRenderer);
+ //ALOGV("GL Extensions %s", mGL.mExtensions);
const char *verptr = NULL;
if (strlen((const char *)dc->gl.gl.version) > 9) {
@@ -360,7 +360,7 @@
dc->gl.vertexArrayState->init(dc->gl.gl.maxVertexAttribs);
dc->gl.currentFrameBuffer = NULL;
- LOGV("%p initGLThread end", rsc);
+ ALOGV("%p initGLThread end", rsc);
rsc->setWatchdogGL(NULL, 0, NULL);
return true;
}
diff --git a/driver/rsdProgram.cpp b/driver/rsdProgram.cpp
index 7556e50..54484df 100644
--- a/driver/rsdProgram.cpp
+++ b/driver/rsdProgram.cpp
@@ -68,7 +68,7 @@
if(pv->mHal.drv) {
drv = (RsdShader*)pv->mHal.drv;
if (rsc->props.mLogShaders) {
- LOGV("Destroying vertex shader with ID %u", drv->getShaderID());
+ ALOGV("Destroying vertex shader with ID %u", drv->getShaderID());
}
if (drv->getShaderID()) {
dc->gl.shaderCache->cleanupVertex(drv->getShaderID());
@@ -99,7 +99,7 @@
if(pf->mHal.drv) {
drv = (RsdShader*)pf->mHal.drv;
if (rsc->props.mLogShaders) {
- LOGV("Destroying fragment shader with ID %u", drv->getShaderID());
+ ALOGV("Destroying fragment shader with ID %u", drv->getShaderID());
}
if (drv->getShaderID()) {
dc->gl.shaderCache->cleanupFragment(drv->getShaderID());
diff --git a/driver/rsdShader.cpp b/driver/rsdShader.cpp
index bdb60c2..e9ce7c2 100644
--- a/driver/rsdShader.cpp
+++ b/driver/rsdShader.cpp
@@ -172,8 +172,8 @@
rsAssert(mShaderID);
if (rsc->props.mLogShaders) {
- LOGV("Loading shader type %x, ID %i", mType, mShaderID);
- LOGV("%s", mShader.string());
+ ALOGV("Loading shader type %x, ID %i", mType, mShaderID);
+ ALOGV("%s", mShader.string());
}
if (mShaderID) {
@@ -202,7 +202,7 @@
}
if (rsc->props.mLogShaders) {
- LOGV("--Shader load result %x ", glGetError());
+ ALOGV("--Shader load result %x ", glGetError());
}
mIsValid = true;
return true;
@@ -252,36 +252,36 @@
uint32_t elementSize = field->getSizeBytes() / sizeof(float);
for (uint32_t i = 0; i < arraySize; i ++) {
if (arraySize > 1) {
- LOGV("Array Element [%u]", i);
+ ALOGV("Array Element [%u]", i);
}
if (dataType == RS_TYPE_MATRIX_4X4) {
- LOGV("Matrix4x4");
- LOGV("{%f, %f, %f, %f", fd[0], fd[4], fd[8], fd[12]);
- LOGV(" %f, %f, %f, %f", fd[1], fd[5], fd[9], fd[13]);
- LOGV(" %f, %f, %f, %f", fd[2], fd[6], fd[10], fd[14]);
- LOGV(" %f, %f, %f, %f}", fd[3], fd[7], fd[11], fd[15]);
+ ALOGV("Matrix4x4");
+ ALOGV("{%f, %f, %f, %f", fd[0], fd[4], fd[8], fd[12]);
+ ALOGV(" %f, %f, %f, %f", fd[1], fd[5], fd[9], fd[13]);
+ ALOGV(" %f, %f, %f, %f", fd[2], fd[6], fd[10], fd[14]);
+ ALOGV(" %f, %f, %f, %f}", fd[3], fd[7], fd[11], fd[15]);
} else if (dataType == RS_TYPE_MATRIX_3X3) {
- LOGV("Matrix3x3");
- LOGV("{%f, %f, %f", fd[0], fd[3], fd[6]);
- LOGV(" %f, %f, %f", fd[1], fd[4], fd[7]);
- LOGV(" %f, %f, %f}", fd[2], fd[5], fd[8]);
+ ALOGV("Matrix3x3");
+ ALOGV("{%f, %f, %f", fd[0], fd[3], fd[6]);
+ ALOGV(" %f, %f, %f", fd[1], fd[4], fd[7]);
+ ALOGV(" %f, %f, %f}", fd[2], fd[5], fd[8]);
} else if (dataType == RS_TYPE_MATRIX_2X2) {
- LOGV("Matrix2x2");
- LOGV("{%f, %f", fd[0], fd[2]);
- LOGV(" %f, %f}", fd[1], fd[3]);
+ ALOGV("Matrix2x2");
+ ALOGV("{%f, %f", fd[0], fd[2]);
+ ALOGV(" %f, %f}", fd[1], fd[3]);
} else {
switch (field->getComponent().getVectorSize()) {
case 1:
- LOGV("Uniform 1 = %f", fd[0]);
+ ALOGV("Uniform 1 = %f", fd[0]);
break;
case 2:
- LOGV("Uniform 2 = %f %f", fd[0], fd[1]);
+ ALOGV("Uniform 2 = %f %f", fd[0], fd[1]);
break;
case 3:
- LOGV("Uniform 3 = %f %f %f", fd[0], fd[1], fd[2]);
+ ALOGV("Uniform 3 = %f %f %f", fd[0], fd[1], fd[2]);
break;
case 4:
- LOGV("Uniform 4 = %f %f %f %f", fd[0], fd[1], fd[2], fd[3]);
+ ALOGV("Uniform 4 = %f %f %f %f", fd[0], fd[1], fd[2], fd[3]);
break;
default:
rsAssert(0);
@@ -479,7 +479,7 @@
arraySize = sc->fragUniformSize(uidx);
}
if (rsc->props.mLogShadersUniforms) {
- LOGV("Uniform slot=%i, offset=%i, constant=%i, field=%i, uidx=%i, name=%s",
+ ALOGV("Uniform slot=%i, offset=%i, constant=%i, field=%i, uidx=%i, name=%s",
slot, offset, ct, field, uidx, fieldName);
}
uidx ++;
diff --git a/driver/rsdShaderCache.cpp b/driver/rsdShaderCache.cpp
index d11490c..2871a12 100644
--- a/driver/rsdShaderCache.cpp
+++ b/driver/rsdShaderCache.cpp
@@ -54,7 +54,7 @@
}
if (rsc->props.mLogShaders) {
- LOGV("%s U, %s = %d, arraySize = %d\n", logTag,
+ ALOGV("%s U, %s = %d, arraySize = %d\n", logTag,
prog->getUniformName(ct).string(), data[ct].slot, data[ct].arraySize);
}
}
@@ -119,22 +119,22 @@
if (!vtx->getShaderID() || !frag->getShaderID()) {
return false;
}
- //LOGV("rsdShaderCache lookup vtx %i, frag %i", vtx->getShaderID(), frag->getShaderID());
+ //ALOGV("rsdShaderCache lookup vtx %i, frag %i", vtx->getShaderID(), frag->getShaderID());
uint32_t entryCount = mEntries.size();
for (uint32_t ct = 0; ct < entryCount; ct ++) {
if ((mEntries[ct]->vtx == vtx->getShaderID()) &&
(mEntries[ct]->frag == frag->getShaderID())) {
- //LOGV("SC using program %i", mEntries[ct]->program);
+ //ALOGV("SC using program %i", mEntries[ct]->program);
glUseProgram(mEntries[ct]->program);
mCurrent = mEntries[ct];
- //LOGV("RsdShaderCache hit, using %i", ct);
+ //ALOGV("RsdShaderCache hit, using %i", ct);
rsdGLCheckError(rsc, "RsdShaderCache::link (hit)");
return true;
}
}
- //LOGV("RsdShaderCache miss");
+ //ALOGV("RsdShaderCache miss");
//LOGE("e0 %x", glGetError());
ProgramEntry *e = new ProgramEntry(vtx->getAttribCount(),
vtx->getUniformCount(),
@@ -180,7 +180,7 @@
e->vtxAttrs[ct].slot = glGetAttribLocation(pgm, vtx->getAttribName(ct));
e->vtxAttrs[ct].name = vtx->getAttribName(ct).string();
if (rsc->props.mLogShaders) {
- LOGV("vtx A %i, %s = %d\n", ct, vtx->getAttribName(ct).string(), e->vtxAttrs[ct].slot);
+ ALOGV("vtx A %i, %s = %d\n", ct, vtx->getAttribName(ct).string(), e->vtxAttrs[ct].slot);
}
}
@@ -229,7 +229,7 @@
}
}
- //LOGV("SC made program %i", e->program);
+ //ALOGV("SC made program %i", e->program);
glUseProgram(e->program);
rsdGLCheckError(rsc, "RsdShaderCache::link (miss)");
diff --git a/driver/rsdVertexArray.cpp b/driver/rsdVertexArray.cpp
index 62ec107..1836e67 100644
--- a/driver/rsdVertexArray.cpp
+++ b/driver/rsdVertexArray.cpp
@@ -65,9 +65,9 @@
void RsdVertexArray::logAttrib(uint32_t idx, uint32_t slot) const {
if (idx == 0) {
- LOGV("Starting vertex attribute binding");
+ ALOGV("Starting vertex attribute binding");
}
- LOGV("va %i: slot=%i name=%s buf=%i ptr=%p size=%i type=0x%x stride=0x%x norm=%i offset=0x%x",
+ ALOGV("va %i: slot=%i name=%s buf=%i ptr=%p size=%i type=0x%x stride=0x%x norm=%i offset=0x%x",
idx, slot,
mAttribs[idx].name.string(),
mAttribs[idx].buffer,
