commit 5fbf177ce23fc52625e1d7a6914fd7a9ce12c311
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:54:43 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:54:43 2012 +0000
tree 6b9feb861108ef687ce79b22673070568a8b718b
parent b6b27bc4179f0cab0c64c599d19ce2f4f2623d98

Moves applyShaders to Renderer

TRAC #22154

Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch

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

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index aac149b..c365599 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1873,15 +1873,10 @@
 
     if (programBinary->getSerial() != mAppliedProgramBinarySerial)
     {
-        IDirect3DVertexShader9 *vertexShader = programBinary->getVertexShader();
-        IDirect3DPixelShader9 *pixelShader = programBinary->getPixelShader();
-
-        mDevice->SetPixelShader(pixelShader);
-        mDevice->SetVertexShader(vertexShader);
-        programBinary->dirtyAllUniforms();
+        mRenderer->applyShaders(programBinary);
         mAppliedProgramBinarySerial = programBinary->getSerial();
     }
-
+    
     programBinary->applyUniforms();
 }