diff options
| author | 2012-09-18 14:13:57 -0700 | |
|---|---|---|
| committer | 2012-09-18 14:13:57 -0700 | |
| commit | 48618c987eed656bf3d8baa6ce25b7f5d3f4a43e (patch) | |
| tree | f5f4bd5532977ec9c456aa425235fbbd76c06a9f /libs/hwui/Program.cpp | |
| parent | cdf964eab3cb9381745886f35b8c5a73ba61e28d (diff) | |
| parent | 0990ffbc4d407e174423a4a04b5902ed83f71db5 (diff) | |
Merge "Fix GL shader bugs" into jb-mr1-dev
Diffstat (limited to 'libs/hwui/Program.cpp')
| -rw-r--r-- | libs/hwui/Program.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 984461ca68d2..5b1b57d3a664 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -178,7 +178,7 @@ void Program::setColor(const float r, const float g, const float b, const float void Program::use() { glUseProgram(mProgramId); if (texCoords >= 0 && !mHasSampler) { - glUniform1i(getUniform("sampler"), 0); + glUniform1i(getUniform("baseSampler"), 0); mHasSampler = true; } mUse = true; |