diff options
| author | 2009-05-28 15:37:57 -0700 | |
|---|---|---|
| committer | 2009-05-28 16:16:46 -0700 | |
| commit | 02fb2cb531035779a25dbf9595e0628ea40585b0 (patch) | |
| tree | c8151779dd70e8242412a327add168a0e5444a4e /libs/rs/rsProgramFragment.cpp | |
| parent | 206b83190708738552be7760acfeefa1143555b5 (diff) | |
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); } |