Removed the programBinary argument from Renderer::setViewport.

src/libGLESv2/Context.cpp

@@ -1697,9 +1697,8 @@ bool Context::applyRenderTarget(GLenum drawMode, bool ignoreViewport)
 
     mRenderer->applyRenderTarget(framebufferObject);
 
-    ProgramBinary *programBinary = mState.currentProgram ? getCurrentProgramBinary() : NULL;
     if (!mRenderer->setViewport(mState.viewport, mState.zNear, mState.zFar, drawMode, mState.rasterizer.frontFace,
-                                ignoreViewport, programBinary))
+                                ignoreViewport))
     {
         return false;
     }

src/libGLESv2/renderer/Renderer.h

@@ -114,7 +114,7 @@ class Renderer
 
     virtual void setScissorRectangle(const gl::Rectangle &scissor, bool enabled) = 0;
     virtual bool setViewport(const gl::Rectangle &viewport, float zNear, float zFar, GLenum drawMode, GLenum frontFace,
-                             bool ignoreViewport, gl::ProgramBinary *currentProgram) = 0;
+                             bool ignoreViewport) = 0;
 
     virtual bool applyRenderTarget(gl::Framebuffer *frameBuffer) = 0;
     virtual void applyShaders(gl::ProgramBinary *programBinary) = 0;

src/libGLESv2/renderer/Renderer11.cpp

@@ -537,7 +537,7 @@ void Renderer11::setScissorRectangle(const gl::Rectangle &scissor, bool enabled)
 }
 
 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 @@ bool Renderer11::setViewport(const gl::Rectangle &viewport, float zNear, float z
         mCurViewport = actualViewport;
         mCurNear = actualZNear;
         mCurFar = actualZFar;
-    }
 
-    if (currentProgram && viewportChanged)
-    {
         mVertexConstants.halfPixelSize[0] = 0.0f;
         mVertexConstants.halfPixelSize[1] = 0.0f;
 

src/libGLESv2/renderer/Renderer11.h

@@ -68,7 +68,7 @@ class Renderer11 : public Renderer
 
     virtual void setScissorRectangle(const gl::Rectangle &scissor, bool enabled);
     virtual bool setViewport(const gl::Rectangle &viewport, float zNear, float zFar, GLenum drawMode, GLenum frontFace,
-                             bool ignoreViewport, gl::ProgramBinary *currentProgram);
+                             bool ignoreViewport);
 
     virtual bool applyPrimitiveType(GLenum mode, GLsizei count);
     virtual bool applyRenderTarget(gl::Framebuffer *frameBuffer);

src/libGLESv2/renderer/Renderer9.cpp

@@ -1026,7 +1026,7 @@ void Renderer9::setScissorRectangle(const gl::Rectangle &scissor, bool enabled)
 }
 
 bool Renderer9::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);
@@ -1063,10 +1063,7 @@ bool Renderer9::setViewport(const gl::Rectangle &viewport, float zNear, float zF
         mCurViewport = actualViewport;
         mCurNear = actualZNear;
         mCurFar = actualZFar;
-    }
 
-    if (currentProgram)
-    {
         dx_VertexConstants vc = {0};
         dx_PixelConstants pc = {0};
 

src/libGLESv2/renderer/Renderer9.h

@@ -96,7 +96,7 @@ class Renderer9 : public Renderer
 
     virtual void setScissorRectangle(const gl::Rectangle &scissor, bool enabled);
     virtual bool setViewport(const gl::Rectangle &viewport, float zNear, float zFar, GLenum drawMode, GLenum frontFace,
-                             bool ignoreViewport, gl::ProgramBinary *currentProgram);
+                             bool ignoreViewport);
 
     virtual bool applyRenderTarget(gl::Framebuffer *frameBuffer);
     virtual void applyShaders(gl::ProgramBinary *programBinary);