From 0990ffbc4d407e174423a4a04b5902ed83f71db5 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Mon, 17 Sep 2012 17:43:45 -0700
Subject: Fix GL shader bugs

Fixing errors in emitted shader code that caused GL errors
at runtime

Change-Id: I267a84398a81329a6688b292505f8779bd750ad1
---
 libs/hwui/Program.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libs/hwui/Program.cpp')

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;
-- 
cgit v1.2.3-59-g8ed1b