Add multisample render target info to DXGI tables.

Saves us some time on startup. Also assume every multisample format can support 1x multisampling, and that if we support a higher format we support all lower sample counts (eg - if we support 16x we support 8x and 4x, etc) BUG=angleproject:1014 Change-Id: I62143e5db561b717edd1a0c96f5e3acd4de3d154 Reviewed-on: https://chromium-review.googlesource.com/275777Reviewed-by: Brandon Jones <bajones@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org>

Add multisample render target info to DXGI tables.
8eeb2bd1 · Jamie Madill · 405f3471 · 8eeb2bd1 · 8eeb2bd1 · 8eeb2bd1
Commit 8eeb2bd1 authored Jun 10, 2015 by Jamie Madill
4 changed files
--- a/src/libANGLE/Caps.cpp
+++ b/src/libANGLE/Caps.cpp
@@ -58,7 +58,7 @@ GLuint TextureCaps::getNearestSamples(GLuint requestedSamples) const
 void TextureCapsMap::insert(GLenum internalFormat, const TextureCaps &caps)
 {
-    mCapsMap.insert(std::make_pair(internalFormat, caps));
+    mCapsMap[internalFormat] = caps;
 }
 void TextureCapsMap::remove(GLenum internalFormat)

--- a/src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json
+++ b/src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json
--- a/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -320,12 +320,19 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLint maxClientVersion, GLenum 
    if (support.query(formatInfo.renderFormat, D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET))
    {
-        for (size_t sampleCount = 1; sampleCount <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; sampleCount *= 2)
+        // Assume 1x
+        textureCaps.sampleCounts.insert(1);
+        for (size_t sampleCount = 2; sampleCount <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; sampleCount *= 2)
        {
            UINT qualityCount = 0;
-            if (SUCCEEDED(device->CheckMultisampleQualityLevels(formatInfo.renderFormat, sampleCount, &qualityCount)) &&
+            if (SUCCEEDED(device->CheckMultisampleQualityLevels(formatInfo.renderFormat, sampleCount, &qualityCount)))
-                qualityCount > 0)
            {
+                // Assume we always support lower sample counts
+                if (qualityCount == 0)
+                {
+                    break;
+                }
                textureCaps.sampleCounts.insert(sampleCount);
            }
        }