commit 909f21cc11758a717d8b1649944f93d6000251be
author apatrick@chromium.org <apatrick@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Aug 17 20:06:02 2012 +0000
committer apatrick@chromium.org <apatrick@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Fri Aug 17 20:06:02 2012 +0000
tree 4bec0b30a8005278aa06ec9bf236c65c7970b3a0
parent 74ff2edc2c3fa79d9469561be243d889cc836e73

Reset shaders to null in makeCurrent.
Review URL: https://codereview.appspot.com/6460100

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

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 970ee12..6db7ef4 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -369,6 +369,10 @@
     {
         depthStencil->Release();
     }
+
+    // Reset pixel shader to null to work around a bug that only happens with Intel GPUs.
+    // http://crbug.com/110343
+    mDevice->SetPixelShader(NULL);
     
     markAllStateDirty();
 }