commit 159d42b546f94fdc5972f3fbdfde9fd8a8735953
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 22 17:47:22 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 22 17:47:22 2012 +0000
tree d145068d2b2b18319c736a0ba3d4608b57e0db58
parent 4fe9b1b7406f8e29102287c4594ef8cf733513a7

Remove two params from GrGLProgramStage::setData that are no longer necessary.

R=senorblanco@chromium.org
Review URL: https://codereview.appspot.com/6744062

git-svn-id: http://skia.googlecode.com/svn/trunk@6031 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLProgram.cpp

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 8824114..aca42f7 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -969,8 +969,7 @@
 
 void GrGLProgram::setData(const GrDrawState& drawState) {
     int rtHeight = drawState.getRenderTarget()->height();
-    if (GrGLUniformManager::kInvalidUniformHandle != fUniforms.fRTHeight &&
-        rtHeight != fRTHeight) {
+    if (GrGLUniformManager::kInvalidUniformHandle != fUniforms.fRTHeight && fRTHeight != rtHeight) {
         fUniformManager.set1f(fUniforms.fRTHeight, GrIntToScalar(rtHeight));
         fRTHeight = rtHeight;
     }
@@ -978,10 +977,7 @@
         if (NULL != fProgramStage[s]) {
             const GrSamplerState& sampler = drawState.getSampler(s);
             GrAssert(NULL != sampler.getCustomStage());
-            fProgramStage[s]->setData(fUniformManager,
-                                      *sampler.getCustomStage(),
-                                      drawState.getRenderTarget(),
-                                      s);
+            fProgramStage[s]->setData(fUniformManager, *sampler.getCustomStage());
         }
     }
 }