Fixed compressed texture support reporting for feature level 9_3

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

@@ -3275,6 +3275,11 @@ gl::Error Renderer11::blitRenderbufferRect(const gl::Rectangle &readRect, const
     return result;
 }
 
+bool Renderer11::isES3Capable() const
+{
+    return (d3d11_gl::GetMaximumClientVersion(mFeatureLevel) > 2);
+};
+
 ID3D11Texture2D *Renderer11::resolveMultisampledTexture(ID3D11Texture2D *source, unsigned int subresource)
 {
     D3D11_TEXTURE2D_DESC textureDesc;

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

@@ -209,7 +209,7 @@ class Renderer11 : public RendererD3D
                                    RenderTargetD3D *drawRenderTarget, GLenum filter, const gl::Rectangle *scissor,
                                    bool colorBlit, bool depthBlit, bool stencilBlit);
 
-    bool isES3Capable() const { return mFeatureLevel >= D3D_FEATURE_LEVEL_10_0; };
+    bool isES3Capable() const;
     D3D_FEATURE_LEVEL getFeatureLevel() const { return mFeatureLevel; };
 
   private:

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

@@ -228,7 +228,24 @@ D3D11_QUERY ConvertQueryType(GLenum queryType)
 namespace d3d11_gl
 {
 
-static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, ID3D11Device *device)
+GLint GetMaximumClientVersion(D3D_FEATURE_LEVEL featureLevel)
+{
+    switch (featureLevel)
+    {
+      case D3D_FEATURE_LEVEL_11_1:
+      case D3D_FEATURE_LEVEL_11_0:
+      case D3D_FEATURE_LEVEL_10_1:
+      case D3D_FEATURE_LEVEL_10_0: return 3;
+
+      case D3D_FEATURE_LEVEL_9_3:
+      case D3D_FEATURE_LEVEL_9_2:
+      case D3D_FEATURE_LEVEL_9_1:  return 2;
+
+      default: UNREACHABLE();      return 0;
+    }
+}
+
+static gl::TextureCaps GenerateTextureFormatCaps(GLint maxClientVersion, GLenum internalFormat, ID3D11Device *device)
 {
     gl::TextureCaps textureCaps;
 
@@ -244,9 +261,12 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLenum internalFormat, ID3D11De
         }
         else
         {
-            textureCaps.texturable = ((formatSupport & D3D11_FORMAT_SUPPORT_TEXTURE2D) != 0) &&
-                                     ((formatSupport & D3D11_FORMAT_SUPPORT_TEXTURECUBE) != 0) &&
-                                     ((formatSupport & D3D11_FORMAT_SUPPORT_TEXTURE3D) != 0);
+            UINT formatSupportMask = D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURECUBE;
+            if (maxClientVersion > 2)
+            {
+                formatSupportMask |= D3D11_FORMAT_SUPPORT_TEXTURE3D;
+            }
+            textureCaps.texturable = ((formatSupport & formatSupportMask) == formatSupportMask);
         }
     }
 
@@ -916,11 +936,13 @@ static size_t GetMaximumStreamOutputSeparateComponents(D3D_FEATURE_LEVEL feature
 
 void GenerateCaps(ID3D11Device *device, gl::Caps *caps, gl::TextureCapsMap *textureCapsMap, gl::Extensions *extensions)
 {
+    D3D_FEATURE_LEVEL featureLevel = device->GetFeatureLevel();
+
     GLuint maxSamples = 0;
     const gl::FormatSet &allFormats = gl::GetAllSizedInternalFormats();
     for (gl::FormatSet::const_iterator internalFormat = allFormats.begin(); internalFormat != allFormats.end(); ++internalFormat)
     {
-        gl::TextureCaps textureCaps = GenerateTextureFormatCaps(*internalFormat, device);
+        gl::TextureCaps textureCaps = GenerateTextureFormatCaps(GetMaximumClientVersion(featureLevel), *internalFormat, device);
         textureCapsMap->insert(*internalFormat, textureCaps);
 
         maxSamples = std::max(maxSamples, textureCaps.getMaxSamples());
@@ -931,8 +953,6 @@ void GenerateCaps(ID3D11Device *device, gl::Caps *caps, gl::TextureCapsMap *text
         }
     }
 
-    D3D_FEATURE_LEVEL featureLevel = device->GetFeatureLevel();
-
     // GL core feature limits
     caps->maxElementIndex = static_cast<GLint64>(std::numeric_limits<unsigned int>::max());
     caps->max3DTextureSize = GetMaximum3DTextureSize(featureLevel);

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

@@ -50,6 +50,7 @@ D3D11_QUERY ConvertQueryType(GLenum queryType);
 namespace d3d11_gl
 {
 
+GLint GetMaximumClientVersion(D3D_FEATURE_LEVEL featureLevel);
 void GenerateCaps(ID3D11Device *device, gl::Caps *caps, gl::TextureCapsMap *textureCapsMap, gl::Extensions *extensions);
 
 }

tests/angle_tests/CompressedTextureTest.cpp

@@ -2,7 +2,7 @@
 #include "media/pixel.inl"
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_TYPED_TEST_CASE(CompressedTextureTest, ES2_D3D9, ES2_D3D11);
+ANGLE_TYPED_TEST_CASE(CompressedTextureTest, ES2_D3D9, ES2_D3D11, ES2_D3D11_FL9_3);
 
 template<typename T>
 class CompressedTextureTest : public ANGLETest
@@ -171,7 +171,7 @@ ANGLE_TYPED_TEST_CASE(CompressedTextureTestES3, ES3_D3D11);
 template<typename T>
 class CompressedTextureTestES3 : public CompressedTextureTest<T> { };
 
-ANGLE_TYPED_TEST_CASE(CompressedTextureTestD3D11, ES2_D3D11, ES3_D3D11);
+ANGLE_TYPED_TEST_CASE(CompressedTextureTestD3D11, ES2_D3D11, ES3_D3D11, ES2_D3D11_FL9_3);
 
 template<typename T>
 class CompressedTextureTestD3D11 : public CompressedTextureTest<T> { };