Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
This commit is contained in:
@@ -30,14 +30,14 @@ static GLubyte *gVersionString= (GLubyte *) "OpenGL ES-CM 1.0";
|
||||
static GLubyte *gExtensionsString= (GLubyte *) ""; // no extensions at this point;
|
||||
|
||||
#define SET_ERROR_IF(condition,err) if((condition)) { \
|
||||
LOGE("%s:%s:%d GL error 0x%x\n", __FILE__, __FUNCTION__, __LINE__, err); \
|
||||
ALOGE("%s:%s:%d GL error 0x%x\n", __FILE__, __FUNCTION__, __LINE__, err); \
|
||||
ctx->setError(err); \
|
||||
return; \
|
||||
}
|
||||
|
||||
|
||||
#define RET_AND_SET_ERROR_IF(condition,err,ret) if((condition)) { \
|
||||
LOGE("%s:%s:%d GL error 0x%x\n", __FILE__, __FUNCTION__, __LINE__, err); \
|
||||
ALOGE("%s:%s:%d GL error 0x%x\n", __FILE__, __FUNCTION__, __LINE__, err); \
|
||||
ctx->setError(err); \
|
||||
return ret; \
|
||||
}
|
||||
@@ -537,7 +537,7 @@ void GLEncoder::s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum
|
||||
}
|
||||
|
||||
if (!has_immediate_arrays && !has_indirect_arrays) {
|
||||
LOGE("glDrawElements: no data bound to the command - ignoring\n");
|
||||
ALOGE("glDrawElements: no data bound to the command - ignoring\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -580,7 +580,7 @@ void GLEncoder::s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum
|
||||
}
|
||||
break;
|
||||
default:
|
||||
LOGE("unsupported index buffer type %d\n", type);
|
||||
ALOGE("unsupported index buffer type %d\n", type);
|
||||
}
|
||||
if (has_indirect_arrays || 1) {
|
||||
ctx->sendVertexData(minIndex, maxIndex - minIndex + 1);
|
||||
@@ -593,7 +593,7 @@ void GLEncoder::s_glDrawElements(void *self, GLenum mode, GLsizei count, GLenum
|
||||
} else {
|
||||
// we are all direct arrays and immidate mode index array -
|
||||
// rebuild the arrays and the index array;
|
||||
LOGE("glDrawElements: direct index & direct buffer data - will be implemented in later versions;\n");
|
||||
ALOGE("glDrawElements: direct index & direct buffer data - will be implemented in later versions;\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -605,7 +605,7 @@ void GLEncoder::s_glActiveTexture(void* self, GLenum texture)
|
||||
GLenum err;
|
||||
|
||||
if ((err = state->setActiveTextureUnit(texture)) != GL_NO_ERROR) {
|
||||
LOGE("%s:%s:%d GL error %#x\n", __FILE__, __FUNCTION__, __LINE__, err);
|
||||
ALOGE("%s:%s:%d GL error %#x\n", __FILE__, __FUNCTION__, __LINE__, err);
|
||||
ctx->setError(err);
|
||||
return;
|
||||
}
|
||||
@@ -621,7 +621,7 @@ void GLEncoder::s_glBindTexture(void* self, GLenum target, GLuint texture)
|
||||
|
||||
GLboolean firstUse;
|
||||
if ((err = state->bindTexture(target, texture, &firstUse)) != GL_NO_ERROR) {
|
||||
LOGE("%s:%s:%d GL error %#x\n", __FILE__, __FUNCTION__, __LINE__, err);
|
||||
ALOGE("%s:%s:%d GL error %#x\n", __FILE__, __FUNCTION__, __LINE__, err);
|
||||
ctx->setError(err);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user