diff options
| author | 2009-05-28 16:43:29 -0700 | |
|---|---|---|
| committer | 2009-05-28 16:43:29 -0700 | |
| commit | b2b96c255b2dfc442a4cbb72b8df607c0217a805 (patch) | |
| tree | fc05f4b3e72fa7bfc3f098a08bc46f5af8a2115d /libs/rs/rsProgramFragment.cpp | |
| parent | 3d7fcb6918b807ce780fc2f3e9b2301fa1779124 (diff) | |
| parent | 02fb2cb531035779a25dbf9595e0628ea40585b0 (diff) | |
Merge change 2668
* changes:
Add sampler support
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
| -rw-r--r-- | libs/rs/rsProgramFragment.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp index 1a6e2c7fb51a..3d316ea1cbda 100644 --- a/libs/rs/rsProgramFragment.cpp +++ b/libs/rs/rsProgramFragment.cpp @@ -62,14 +62,14 @@ void ProgramFragment::setupGL() break; } -// if (mSamplers[ct].get()) { - //mSamplers[ct]->setupGL(); -// } else { + if (mSamplers[ct].get()) { + mSamplers[ct]->setupGL(); + } else { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - //} + } } glActiveTexture(GL_TEXTURE0); } |