summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramFragment.cpp
diff options
context:
space:
mode:
author Steve Block <steveblock@google.com> 2012-01-09 10:13:41 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-09 10:13:41 -0800
commit08289f55eae5c4127091360e862f78d57ae24c15 (patch)
tree4bc65b61ad79f1a6326aff3d501056a57695fa4b /libs/rs/rsProgramFragment.cpp
parentc0c3025cf2b887b4eb7020c1b7e6f0db69a51aef (diff)
parent3762c311729fe9f3af085c14c5c1fb471d994c03 (diff)
Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE"
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
-rw-r--r--libs/rs/rsProgramFragment.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp
index 81eedc424994..4e73ca63e90b 100644
--- a/libs/rs/rsProgramFragment.cpp
+++ b/libs/rs/rsProgramFragment.cpp
@@ -38,12 +38,12 @@ ProgramFragment::~ProgramFragment() {
void ProgramFragment::setConstantColor(Context *rsc, float r, float g, float b, float a) {
if (isUserProgram()) {
- LOGE("Attempting to set fixed function emulation color on user program");
+ ALOGE("Attempting to set fixed function emulation color on user program");
rsc->setError(RS_ERROR_BAD_SHADER, "Cannot set fixed function emulation color on user program");
return;
}
if (mHal.state.constants[0] == NULL) {
- LOGE("Unable to set fixed function emulation color because allocation is missing");
+ ALOGE("Unable to set fixed function emulation color because allocation is missing");
rsc->setError(RS_ERROR_BAD_SHADER, "Unable to set fixed function emulation color because allocation is missing");
return;
}
@@ -63,7 +63,7 @@ void ProgramFragment::setup(Context *rsc, ProgramFragmentState *state) {
for (uint32_t ct=0; ct < mHal.state.texturesCount; ct++) {
if (!mHal.state.textures[ct]) {
- LOGE("No texture bound for shader id %u, texture unit %u", (uint)this, ct);
+ ALOGE("No texture bound for shader id %u, texture unit %u", (uint)this, ct);
rsc->setError(RS_ERROR_BAD_SHADER, "No texture bound");
continue;
}
@@ -131,7 +131,7 @@ RsProgramFragment rsi_ProgramFragmentCreate(Context *rsc, const char * shaderTex
size_t paramLength) {
ProgramFragment *pf = new ProgramFragment(rsc, shaderText, shaderLength, params, paramLength);
pf->incUserRef();
- //LOGE("rsi_ProgramFragmentCreate %p", pf);
+ //ALOGE("rsi_ProgramFragmentCreate %p", pf);
return pf;
}