diff options
| author | 2009-12-14 14:32:48 -0800 | |
|---|---|---|
| committer | 2009-12-14 14:32:48 -0800 | |
| commit | 6015f4e0fc2c57f740557196e31b4cf976500d4c (patch) | |
| tree | b66064d8dc24a147df490426728bf8c06b1b3b5e /libs/rs/rsProgramFragment.cpp | |
| parent | e143bc92b2dfa205ea6af80855132bf52e018688 (diff) | |
| parent | 3b7d39bb51f851ddee441fa34884495217e477f9 (diff) | |
Merge change I3b7d39bb
* changes:
Implement RS tracked defered texture and buffer object uploads.
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
| -rw-r--r-- | libs/rs/rsProgramFragment.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp index b239ce876b67..1225ff3e016e 100644 --- a/libs/rs/rsProgramFragment.cpp +++ b/libs/rs/rsProgramFragment.cpp @@ -67,6 +67,7 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state) } glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, mPointSpriteEnable); } + mTextures[ct]->uploadCheck(rsc); glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID()); switch(mEnvModes[ct]) { @@ -126,6 +127,7 @@ void ProgramFragment::setupGL2(const Context *rsc, ProgramFragmentState *state, continue; } + mTextures[ct]->uploadCheck(rsc); glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID()); if (mSamplers[ct].get()) { mSamplers[ct]->setupGL(); |