diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-05-12 10:15:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-12 10:15:17 -0700 |
| commit | 415c842aa6dd3cc797ed2ef1ae42351f594a6c74 (patch) | |
| tree | 938ce71744d87aa03730d7fce22ca0243a369fa9 /libs/rs/driver/rsdShaderCache.cpp | |
| parent | e4ba346f0f1bb153ec1f9da5c0a4fc96c301efda (diff) | |
| parent | 407cae950325682a56fe5373dd218a666da901ef (diff) | |
| download | frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.zip frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.gz frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.bz2 | |
Merge "rsLib cleanup"
Diffstat (limited to 'libs/rs/driver/rsdShaderCache.cpp')
| -rw-r--r-- | libs/rs/driver/rsdShaderCache.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/rs/driver/rsdShaderCache.cpp b/libs/rs/driver/rsdShaderCache.cpp index 18a8225..d11490c 100644 --- a/libs/rs/driver/rsdShaderCache.cpp +++ b/libs/rs/driver/rsdShaderCache.cpp @@ -19,6 +19,7 @@ #include "rsdShader.h" #include "rsdShaderCache.h" +#include "rsdGL.h" #include <GLES/gl.h> #include <GLES2/gl2.h> @@ -128,7 +129,7 @@ bool RsdShaderCache::link(const Context *rsc) { glUseProgram(mEntries[ct]->program); mCurrent = mEntries[ct]; //LOGV("RsdShaderCache hit, using %i", ct); - rsc->checkError("RsdShaderCache::link (hit)"); + rsdGLCheckError(rsc, "RsdShaderCache::link (hit)"); return true; } } @@ -230,7 +231,7 @@ bool RsdShaderCache::link(const Context *rsc) { //LOGV("SC made program %i", e->program); glUseProgram(e->program); - rsc->checkError("RsdShaderCache::link (miss)"); + rsdGLCheckError(rsc, "RsdShaderCache::link (miss)"); return true; } |