commit 0b236e2ec3c32b79d1abca881a32cbf53027e3d3
author shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 25 21:57:07 2013 +0000
committer shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Jan 25 21:57:07 2013 +0000
tree 2cfea88901ac767402e159b4331d05de79d17eb3
parent 03951cf9a040453111dc4b312bf276aee7337ea6

Removed the programBinary argument from Renderer::setViewport.

TRAC #22478

Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1796 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index b071af7..7779a76 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -537,7 +537,7 @@
 }
 
 bool Renderer11::setViewport(const gl::Rectangle &viewport, float zNear, float zFar, GLenum drawMode, GLenum frontFace, 
-                             bool ignoreViewport, gl::ProgramBinary *currentProgram)
+                             bool ignoreViewport)
 {
     gl::Rectangle actualViewport = viewport;
     float actualZNear = gl::clamp01(zNear);
@@ -575,10 +575,7 @@
         mCurViewport = actualViewport;
         mCurNear = actualZNear;
         mCurFar = actualZFar;
-    }
 
-    if (currentProgram && viewportChanged)
-    {
         mVertexConstants.halfPixelSize[0] = 0.0f;
         mVertexConstants.halfPixelSize[1] = 0.0f;