Make sure non-multi-sampled EGL configs are always exposed.

It is possible for some hardware to not support multisampling on any texture formats which results in an empty sample set for all formats. BUG=angleproject:2242 Change-Id: I8148c781ec22ec02562b6a8b5d1b966c6f13915e Reviewed-on: https://chromium-review.googlesource.com/766568Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Make sure non-multi-sampled EGL configs are always exposed.
05fd3860 · Geoff Lang · Commit Bot · 491b0d60 · 05fd3860 · 05fd3860
Commit 05fd3860 authored Nov 13, 2017 by Geoff Lang Committed by Commit Bot Nov 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

Renderer11.cpp src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +4 -7

Renderer11.h src/libANGLE/renderer/d3d/d3d11/Renderer11.h +1 -1

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -989,7 +989,7 @@ void Renderer11::populateRenderer11DeviceCaps()
    SafeRelease(dxgiAdapter2);
 }
-gl::SupportedSampleSet Renderer11::generateSampleSetFromCaps(
+gl::SupportedSampleSet Renderer11::generateSampleSetForEGLConfig(
    const gl::TextureCaps &colorBufferFormatCaps,
    const gl::TextureCaps &depthStencilBufferFormatCaps) const
 {
@@ -1015,11 +1015,8 @@ gl::SupportedSampleSet Renderer11::generateSampleSetFromCaps(
        sampleCounts = depthStencilBufferFormatCaps.sampleCounts;
    }
-    // In EGL, no multisampling is 0, in D3D its 1, so if 1 exists, insert 0 for EGL to match.
+    // Always support 0 samples
-    if (sampleCounts.find(1) != sampleCounts.end())
+    sampleCounts.insert(0);
-    {
-        sampleCounts.insert(0);
-    }
    return sampleCounts;
 }
@@ -1091,7 +1088,7 @@ egl::ConfigSet Renderer11::generateConfigs()
            const gl::Version &maxVersion = getMaxSupportedESVersion();
            const gl::SupportedSampleSet sampleCounts =
-                generateSampleSetFromCaps(colorBufferFormatCaps, depthStencilBufferFormatCaps);
+                generateSampleSetForEGLConfig(colorBufferFormatCaps, depthStencilBufferFormatCaps);
            for (GLuint sampleCount : sampleCounts)
            {

--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
@@ -497,7 +497,7 @@ class Renderer11 : public RendererD3D
                                const gl::Offset &destOffset,
                                RenderTargetD3D *destRenderTarget);
-    gl::SupportedSampleSet generateSampleSetFromCaps(
+    gl::SupportedSampleSet generateSampleSetForEGLConfig(
        const gl::TextureCaps &colorBufferFormatCaps,
        const gl::TextureCaps &depthStencilBufferFormatCaps) const;