Fix multi-sample state management.

src/common/version.h

 #define MAJOR_VERSION 0
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 680
+#define BUILD_REVISION 681
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Context.cpp

@@ -1869,6 +1869,7 @@ void Context::applyState(GLenum drawMode)
         }
 
         mStencilStateDirty = false;
+        mFrontFaceDirty = false;
     }
 
     if (mMaskStateDirty)
@@ -1903,8 +1904,6 @@ void Context::applyState(GLenum drawMode)
 
     if (mSampleStateDirty)
     {
-        if (framebufferObject->isMultisample())
-        {
         if (mState.sampleAlphaToCoverage)
         {
             FIXME("Sample alpha to coverage is unimplemented.");
@@ -1941,11 +1940,6 @@ void Context::applyState(GLenum drawMode)
         {
             device->SetRenderState(D3DRS_MULTISAMPLEMASK, 0xFFFFFFFF);
         }
-        }
-        else
-        {
-            device->SetRenderState(D3DRS_MULTISAMPLEANTIALIAS, FALSE);
-        }
 
         mSampleStateDirty = false;
     }
@@ -1956,8 +1950,6 @@ void Context::applyState(GLenum drawMode)
 
         mDitherStateDirty = false;
     }
-
-    mFrontFaceDirty = false;
 }
 
 GLenum Context::applyVertexBuffer(GLint first, GLsizei count)

src/libGLESv2/Framebuffer.cpp

@@ -268,23 +268,6 @@ bool Framebuffer::hasStencil()
     return false;
 }
 
-bool Framebuffer::isMultisample()
-{
-    // If the framebuffer is not complete, attachment samples may be mismatched, and it
-    // cannot be used as a multisample framebuffer. If it is complete, it is required to
-    // have a color attachment, and all its attachments must have the same number of samples,
-    // so the number of samples for the colorbuffer will indicate whether the framebuffer is
-    // multisampled.
-    if (completeness() == GL_FRAMEBUFFER_COMPLETE && getColorbuffer()->getSamples() > 0)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
 GLenum Framebuffer::completeness()
 {
     int width = 0;

src/libGLESv2/Framebuffer.h

@@ -59,7 +59,6 @@ class Framebuffer
     GLuint getStencilbufferHandle();
 
     bool hasStencil();
-    bool isMultisample();
     int getSamples();
 
     virtual GLenum completeness();