diff options
| author | Nick Kralevich <nnk@google.com> | 2010-05-14 15:49:42 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2010-05-14 15:49:42 -0700 |
| commit | 963b0cdbaf206050fb537c21641c0ee26a48611e (patch) | |
| tree | 60260bc8d86a9dd32b09c341d6b99622610d32b7 /libs/rs | |
| parent | aa8da3dc405dca80c6aff71a7c17f883edea2814 (diff) | |
| parent | cbf26fd3bc2dc0d6377daf65b498ca11b96e601c (diff) | |
| download | frameworks_base-963b0cdbaf206050fb537c21641c0ee26a48611e.zip frameworks_base-963b0cdbaf206050fb537c21641c0ee26a48611e.tar.gz frameworks_base-963b0cdbaf206050fb537c21641c0ee26a48611e.tar.bz2 | |
resolved conflicts for merge of cbf26fd3 to master
Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/rsProgram.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/rsProgram.cpp b/libs/rs/rsProgram.cpp index 478a6dc..70e2868 100644 --- a/libs/rs/rsProgram.cpp +++ b/libs/rs/rsProgram.cpp @@ -195,7 +195,7 @@ bool Program::loadShader(Context *rsc, uint32_t type) if (rsc->props.mLogShaders) { LOGV("Loading shader type %x, ID %i", type, mShaderID); - LOGV(mShader.string()); + LOGV("%s", mShader.string()); } if (mShaderID) { |