Allow multisampling without enabling GL_SAMPLE_COVERAGE.

This setting is only used when an application wants to control which samples are written to. If it is disabled, multisampling should just write to all samples. BUG=38 Review URL: http://codereview.appspot.com/2194043 git-svn-id: https://angleproject.googlecode.com/svn/trunk@431 736b8ea6-26fd-11df-bfd4-992fa37f6226

Allow multisampling without enabling GL_SAMPLE_COVERAGE.
c5f8dea4 · enne@chromium.org · 0fa74639 · c5f8dea4
Commit c5f8dea4 authored Sep 21, 2010 by enne@chromium.org
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

Context.cpp src/libGLESv2/Context.cpp +9 -2

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1896,16 +1896,18 @@ void Context::applyState(GLenum drawMode)
        mPolygonOffsetStateDirty = false;
    }

-    if (framebufferObject->isMultisample() && mSampleStateDirty)
+    if (mSampleStateDirty)
+    {
+        if (framebufferObject->isMultisample())
        {
            if (mState.sampleAlphaToCoverage)
            {
                FIXME("Sample alpha to coverage is unimplemented.");
            }

+            device->SetRenderState(D3DRS_MULTISAMPLEANTIALIAS, TRUE);
            if (mState.sampleCoverage)
            {
-            device->SetRenderState(D3DRS_MULTISAMPLEANTIALIAS, TRUE);
                unsigned int mask = 0;
                if (mState.sampleCoverageValue != 0)
                {
@@ -1932,6 +1934,11 @@ void Context::applyState(GLenum drawMode)
            }
            else
            {
+                device->SetRenderState(D3DRS_MULTISAMPLEMASK, 0xFFFFFFFF);
+            }
+        }
+        else
+        {
            device->SetRenderState(D3DRS_MULTISAMPLEANTIALIAS, FALSE);
        }