D3D11: Restrict ES3 bits to FL 10.1.

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -996,6 +996,7 @@ egl::ConfigSet Renderer11::generateConfigs()
                 gl::GetInternalFormatInfo(colorBufferInternalFormat);
             const gl::InternalFormat &depthStencilBufferFormatInfo =
                 gl::GetInternalFormatInfo(depthStencilBufferInternalFormat);
+            const gl::Version &maxVersion = getMaxSupportedESVersion();
 
             egl::Config config;
             config.renderTargetFormat = colorBufferInternalFormat;
@@ -1013,15 +1014,22 @@ egl::ConfigSet Renderer11::generateConfigs()
             config.colorBufferType = EGL_RGB_BUFFER;
             config.configCaveat    = EGL_NONE;
             config.configID        = static_cast<EGLint>(configs.size() + 1);
-            // Can only support a conformant ES2 with feature level greater than 10.0.
-            config.conformant = (mRenderer11DeviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0)
-                                    ? (EGL_OPENGL_ES2_BIT | EGL_OPENGL_ES3_BIT_KHR)
-                                    : 0;
 
             // PresentPathFast may not be conformant
-            if (mPresentPathFastEnabled)
+            config.conformant = 0;
+            if (!mPresentPathFastEnabled)
             {
-                config.conformant = 0;
+                // Can only support a conformant ES2 with feature level greater than 10.0.
+                if (mRenderer11DeviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0)
+                {
+                    config.conformant |= EGL_OPENGL_ES2_BIT;
+                }
+
+                // We can only support conformant ES3 on FL 10.1+
+                if (maxVersion.major >= 3)
+                {
+                    config.conformant |= EGL_OPENGL_ES3_BIT_KHR;
+                }
             }
 
             config.depthSize         = depthStencilBufferFormatInfo.depthBits;
@@ -1035,11 +1043,14 @@ egl::ConfigSet Renderer11::generateConfigs()
             config.nativeRenderable  = EGL_FALSE;
             config.nativeVisualID    = 0;
             config.nativeVisualType  = EGL_NONE;
-            // Can't support ES3 at all without feature level 10.0
-            config.renderableType =
-                EGL_OPENGL_ES2_BIT | ((mRenderer11DeviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0)
-                                          ? EGL_OPENGL_ES3_BIT_KHR
-                                          : 0);
+
+            // Can't support ES3 at all without feature level 10.1
+            config.renderableType = EGL_OPENGL_ES2_BIT;
+            if (maxVersion.major >= 3)
+            {
+                config.renderableType |= EGL_OPENGL_ES3_BIT_KHR;
+            }
+
             config.sampleBuffers         = 0;  // FIXME: enumerate multi-sampling
             config.samples               = 0;
             config.stencilSize           = depthStencilBufferFormatInfo.stencilBits;