diff options
| author | Jason Sams <rjsams@android.com> | 2010-01-06 11:57:52 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-01-06 12:01:51 -0800 |
| commit | a09a6e145b778861f7abee86ce17e59507ed221e (patch) | |
| tree | 15221ba7d657a5a75ec3f6ae2804c1b79a07a969 /libs/rs/rsProgramFragment.cpp | |
| parent | 432bff01ec67533dbbb6ed27cb190c99e83ea226 (diff) | |
| download | frameworks_base-a09a6e145b778861f7abee86ce17e59507ed221e.zip frameworks_base-a09a6e145b778861f7abee86ce17e59507ed221e.tar.gz frameworks_base-a09a6e145b778861f7abee86ce17e59507ed221e.tar.bz2 | |
More complete support for named attribs. Adds user typed attribs as available to programVertex. Non user attribs are not treated like user for GL2 for simplicity.
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
| -rw-r--r-- | libs/rs/rsProgramFragment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp index f7394a6..00f19ae 100644 --- a/libs/rs/rsProgramFragment.cpp +++ b/libs/rs/rsProgramFragment.cpp @@ -136,6 +136,7 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state) } glActiveTexture(GL_TEXTURE0); mDirty = false; + rsc->checkError("ProgramFragment::setupGL"); } void ProgramFragment::setupGL2(const Context *rsc, ProgramFragmentState *state, ShaderCache *sc) @@ -170,8 +171,7 @@ void ProgramFragment::setupGL2(const Context *rsc, ProgramFragmentState *state, glActiveTexture(GL_TEXTURE0); mDirty = false; - - //LOGE("sgl2 frag2 %x", glGetError()); + rsc->checkError("ProgramFragment::setupGL2"); } void ProgramFragment::loadShader(Context *rsc) { |