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 | 433eca30b2efe0cf84bbda33f2dfdfd6dcafaf59 (patch) | |
| tree | 9840a641c7663c925678184ad687181554ed9da4 /rsProgramFragment.cpp | |
| parent | 2d4445ba2c29342bee37612da1ea3db56553af2b (diff) | |
| download | android_frameworks_rs-433eca30b2efe0cf84bbda33f2dfdfd6dcafaf59.tar.gz android_frameworks_rs-433eca30b2efe0cf84bbda33f2dfdfd6dcafaf59.tar.bz2 android_frameworks_rs-433eca30b2efe0cf84bbda33f2dfdfd6dcafaf59.zip | |
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 'rsProgramFragment.cpp')
| -rw-r--r-- | rsProgramFragment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp index f7394a61..00f19ae8 100644 --- a/rsProgramFragment.cpp +++ b/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) { |