From 02fb2cb531035779a25dbf9595e0628ea40585b0 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Thu, 28 May 2009 15:37:57 -0700 Subject: Add sampler support --- libs/rs/rsProgramFragment.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/rs/rsProgramFragment.cpp') 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); } -- cgit v1.2.3-59-g8ed1b