diff options
author | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
commit | 2e681c1b097883f5c327d3c1c77692ecab498a35 (patch) | |
tree | 7dbf619f6a4e81fd615afc51f5a3b8a4441b167a /libs/rs/driver/rsdShader.cpp | |
parent | 293fa718102353d7b103f10a7c0f580ba87b3a0f (diff) | |
parent | 08289f55eae5c4127091360e862f78d57ae24c15 (diff) | |
download | frameworks_base-2e681c1b097883f5c327d3c1c77692ecab498a35.zip frameworks_base-2e681c1b097883f5c327d3c1c77692ecab498a35.tar.gz frameworks_base-2e681c1b097883f5c327d3c1c77692ecab498a35.tar.bz2 |
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'libs/rs/driver/rsdShader.cpp')
-rw-r--r-- | libs/rs/driver/rsdShader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/rs/driver/rsdShader.cpp b/libs/rs/driver/rsdShader.cpp index 3120bbf..8bf3207 100644 --- a/libs/rs/driver/rsdShader.cpp +++ b/libs/rs/driver/rsdShader.cpp @@ -186,7 +186,7 @@ bool RsdShader::loadShader(const Context *rsc) { char* buf = (char*) malloc(infoLen); if (buf) { RSD_CALL_GL(glGetShaderInfoLog, mShaderID, infoLen, NULL, buf); - LOGE("Could not compile shader \n%s\n", buf); + ALOGE("Could not compile shader \n%s\n", buf); free(buf); } RSD_CALL_GL(glDeleteShader, mShaderID); @@ -279,9 +279,9 @@ void RsdShader::logUniform(const Element *field, const float *fd, uint32_t array rsAssert(0); } } - LOGE("Element size %u data=%p", elementSize, fd); + ALOGE("Element size %u data=%p", elementSize, fd); fd += elementSize; - LOGE("New data=%p", fd); + ALOGE("New data=%p", fd); } } @@ -396,7 +396,7 @@ void RsdShader::setupTextures(const Context *rsc, RsdShaderCache *sc) { uint32_t numTexturesToBind = mRSProgram->mHal.state.texturesCount; uint32_t numTexturesAvailable = dc->gl.gl.maxFragmentTextureImageUnits; if (numTexturesToBind >= numTexturesAvailable) { - LOGE("Attempting to bind %u textures on shader id %u, but only %u are available", + ALOGE("Attempting to bind %u textures on shader id %u, but only %u are available", mRSProgram->mHal.state.texturesCount, (uint32_t)this, numTexturesAvailable); rsc->setError(RS_ERROR_BAD_SHADER, "Cannot bind more textuers than available"); numTexturesToBind = numTexturesAvailable; @@ -414,7 +414,7 @@ void RsdShader::setupTextures(const Context *rsc, RsdShaderCache *sc) { DrvAllocation *drvTex = (DrvAllocation *)mRSProgram->mHal.state.textures[ct]->mHal.drv; if (drvTex->glTarget != GL_TEXTURE_2D && drvTex->glTarget != GL_TEXTURE_CUBE_MAP) { - LOGE("Attempting to bind unknown texture to shader id %u, texture unit %u", (uint)this, ct); + ALOGE("Attempting to bind unknown texture to shader id %u, texture unit %u", (uint)this, ct); rsc->setError(RS_ERROR_BAD_SHADER, "Non-texture allocation bound to a shader"); } RSD_CALL_GL(glBindTexture, drvTex->glTarget, drvTex->textureID); @@ -442,7 +442,7 @@ void RsdShader::setupUserConstants(const Context *rsc, RsdShaderCache *sc, bool for (uint32_t ct=0; ct < mRSProgram->mHal.state.constantsCount; ct++) { Allocation *alloc = mRSProgram->mHal.state.constants[ct]; if (!alloc) { - LOGE("Attempting to set constants on shader id %u, but alloc at slot %u is not set", + ALOGE("Attempting to set constants on shader id %u, but alloc at slot %u is not set", (uint32_t)this, ct); rsc->setError(RS_ERROR_BAD_SHADER, "No constant allocation bound"); continue; |