diff options
| author | Chet Haase <chet@google.com> | 2012-09-17 17:43:45 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2012-09-18 14:10:10 -0700 |
| commit | 0990ffbc4d407e174423a4a04b5902ed83f71db5 (patch) | |
| tree | 1296fbc452975cfb910733c9fe7f865fd474dd7b /libs/hwui/Program.cpp | |
| parent | 218e2f199b9ba568a815d64269ea0784e2d32935 (diff) | |
Fix GL shader bugs
Fixing errors in emitted shader code that caused GL errors
at runtime
Change-Id: I267a84398a81329a6688b292505f8779bd750ad1
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; |