ES31: Add missing initialization of MAX_*_SAMPLES on D3D

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

@@ -1171,7 +1171,6 @@ bool IsMultiviewSupported(D3D_FEATURE_LEVEL featureLevel)
 void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, const Renderer11DeviceCaps &renderer11DeviceCaps, gl::Caps *caps,
                   gl::TextureCapsMap *textureCapsMap, gl::Extensions *extensions, gl::Limitations *limitations)
 {
-    GLuint maxSamples = 0;
     D3D_FEATURE_LEVEL featureLevel = renderer11DeviceCaps.featureLevel;
     const gl::FormatSet &allFormats = gl::GetAllSizedInternalFormats();
     for (GLenum internalFormat : allFormats)
@@ -1180,8 +1179,6 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
             GetMaximumClientVersion(featureLevel), internalFormat, device, renderer11DeviceCaps);
         textureCapsMap->insert(internalFormat, textureCaps);
 
-        maxSamples = std::max(maxSamples, textureCaps.getMaxSamples());
-
         if (gl::GetSizedInternalFormatInfo(internalFormat).compressed)
         {
             caps->compressedTextureFormats.push_back(internalFormat);
@@ -1324,9 +1321,12 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
     caps->maxTransformFeedbackSeparateComponents =
         static_cast<GLuint>(GetMaximumStreamOutputSeparateComponents(featureLevel));
 
-    // Multisample limits
-    caps->maxSamples = maxSamples;
-    caps->maxColorTextureSamples = maxSamples;
+    // Defer the computation of multisample limits to Context::updateCaps() where max*Samples values
+    // are determined according to available sample counts for each individual format.
+    caps->maxSamples             = std::numeric_limits<GLint>::max();
+    caps->maxColorTextureSamples = std::numeric_limits<GLint>::max();
+    caps->maxDepthTextureSamples = std::numeric_limits<GLint>::max();
+    caps->maxIntegerSamples      = std::numeric_limits<GLint>::max();
 
     // GL extension support
     extensions->setTextureExtensionSupport(*textureCapsMap);

src/tests/gl_tests/TextureMultisampleTest.cpp

@@ -140,6 +140,36 @@ TEST_P(TextureMultisampleTestES31, ValidateTextureStorageMultisampleParameters)
     ASSERT_GL_ERROR(GL_INVALID_OPERATION);
 }
 
+// Tests the value of MAX_INTEGER_SAMPLES is no less than 1.
+// [OpenGL ES 3.1 SPEC Table 20.40]
+TEST_P(TextureMultisampleTestES31, MaxIntegerSamples)
+{
+    GLint maxIntegerSamples;
+    glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &maxIntegerSamples);
+    EXPECT_GE(maxIntegerSamples, 1);
+    EXPECT_NE(std::numeric_limits<GLint>::max(), maxIntegerSamples);
+}
+
+// Tests the value of MAX_COLOR_TEXTURE_SAMPLES is no less than 1.
+// [OpenGL ES 3.1 SPEC Table 20.40]
+TEST_P(TextureMultisampleTestES31, MaxColorTextureSamples)
+{
+    GLint maxColorTextureSamples;
+    glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &maxColorTextureSamples);
+    EXPECT_GE(maxColorTextureSamples, 1);
+    EXPECT_NE(std::numeric_limits<GLint>::max(), maxColorTextureSamples);
+}
+
+// Tests the value of MAX_DEPTH_TEXTURE_SAMPLES is no less than 1.
+// [OpenGL ES 3.1 SPEC Table 20.40]
+TEST_P(TextureMultisampleTestES31, MaxDepthTextureSamples)
+{
+    GLint maxDepthTextureSamples;
+    glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &maxDepthTextureSamples);
+    EXPECT_GE(maxDepthTextureSamples, 1);
+    EXPECT_NE(std::numeric_limits<GLint>::max(), maxDepthTextureSamples);
+}
+
 ANGLE_INSTANTIATE_TEST(TextureMultisampleTest,
                        ES31_D3D11(),
                        ES3_OPENGL(),