Remove renderFormat from TextureFormat structure

src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py

@@ -128,26 +128,6 @@ const TextureFormat GetD3D11FormatInfo(GLenum internalFormat,
     info.dsvFormat = dsvFormat;
     info.dataInitializerFunction = internalFormatInitializer;
 
-    // Given a GL internal format, the renderFormat is the DSV format if it is depth- or
-    // stencil-renderable,
-    // the RTV format if it is color-renderable, and the (nonrenderable) texture format otherwise.
-    if (dsvFormat != DXGI_FORMAT_UNKNOWN)
-    {{
-        info.renderFormat = dsvFormat;
-    }}
-    else if (rtvFormat != DXGI_FORMAT_UNKNOWN)
-    {{
-        info.renderFormat = rtvFormat;
-    }}
-    else if (texFormat != DXGI_FORMAT_UNKNOWN)
-    {{
-        info.renderFormat = texFormat;
-    }}
-    else
-    {{
-        info.renderFormat = DXGI_FORMAT_UNKNOWN;
-    }}
-
     // Compute the swizzle formats
     const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat);
     if (internalFormat != GL_NONE && formatInfo.pixelBytes > 0)
@@ -213,7 +193,6 @@ TextureFormat::TextureFormat()
       srvFormat(DXGI_FORMAT_UNKNOWN),
       rtvFormat(DXGI_FORMAT_UNKNOWN),
       dsvFormat(DXGI_FORMAT_UNKNOWN),
-      renderFormat(DXGI_FORMAT_UNKNOWN),
       swizzleTexFormat(DXGI_FORMAT_UNKNOWN),
       swizzleSRVFormat(DXGI_FORMAT_UNKNOWN),
       swizzleRTVFormat(DXGI_FORMAT_UNKNOWN),

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

@@ -363,7 +363,17 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLint maxClientVersion, GLenum
     textureCaps.renderable = (support.query(formatInfo.rtvFormat, D3D11_FORMAT_SUPPORT_RENDER_TARGET)) ||
                              (support.query(formatInfo.dsvFormat, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL));
 
-    if (support.query(formatInfo.renderFormat, D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET))
+    DXGI_FORMAT renderFormat = DXGI_FORMAT_UNKNOWN;
+    if (formatInfo.dsvFormat != DXGI_FORMAT_UNKNOWN)
+    {
+        renderFormat = formatInfo.dsvFormat;
+    }
+    else if (formatInfo.rtvFormat != DXGI_FORMAT_UNKNOWN)
+    {
+        renderFormat = formatInfo.rtvFormat;
+    }
+    if (renderFormat != DXGI_FORMAT_UNKNOWN &&
+        support.query(renderFormat, D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET))
     {
         // Assume 1x
         textureCaps.sampleCounts.insert(1);
@@ -372,7 +382,8 @@ static gl::TextureCaps GenerateTextureFormatCaps(GLint maxClientVersion, GLenum
              sampleCount *= 2)
         {
             UINT qualityCount = 0;
-            if (SUCCEEDED(device->CheckMultisampleQualityLevels(formatInfo.renderFormat, sampleCount, &qualityCount)))
+            if (SUCCEEDED(device->CheckMultisampleQualityLevels(renderFormat, sampleCount,
+                                                                &qualityCount)))
             {
                 // Assume we always support lower sample counts
                 if (qualityCount == 0)

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

@@ -42,7 +42,6 @@ struct TextureFormat
     DXGI_FORMAT srvFormat;
     DXGI_FORMAT rtvFormat;
     DXGI_FORMAT dsvFormat;
-    DXGI_FORMAT renderFormat;
 
     DXGI_FORMAT swizzleTexFormat;
     DXGI_FORMAT swizzleSRVFormat;

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

@@ -115,26 +115,6 @@ const TextureFormat GetD3D11FormatInfo(GLenum internalFormat,
     info.dsvFormat = dsvFormat;
     info.dataInitializerFunction = internalFormatInitializer;
 
-    // Given a GL internal format, the renderFormat is the DSV format if it is depth- or
-    // stencil-renderable,
-    // the RTV format if it is color-renderable, and the (nonrenderable) texture format otherwise.
-    if (dsvFormat != DXGI_FORMAT_UNKNOWN)
-    {
-        info.renderFormat = dsvFormat;
-    }
-    else if (rtvFormat != DXGI_FORMAT_UNKNOWN)
-    {
-        info.renderFormat = rtvFormat;
-    }
-    else if (texFormat != DXGI_FORMAT_UNKNOWN)
-    {
-        info.renderFormat = texFormat;
-    }
-    else
-    {
-        info.renderFormat = DXGI_FORMAT_UNKNOWN;
-    }
-
     // Compute the swizzle formats
     const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(internalFormat);
     if (internalFormat != GL_NONE && formatInfo.pixelBytes > 0)
@@ -200,7 +180,6 @@ TextureFormat::TextureFormat()
       srvFormat(DXGI_FORMAT_UNKNOWN),
       rtvFormat(DXGI_FORMAT_UNKNOWN),
       dsvFormat(DXGI_FORMAT_UNKNOWN),
-      renderFormat(DXGI_FORMAT_UNKNOWN),
       swizzleTexFormat(DXGI_FORMAT_UNKNOWN),
       swizzleSRVFormat(DXGI_FORMAT_UNKNOWN),
       swizzleRTVFormat(DXGI_FORMAT_UNKNOWN),

src/tests/gl_tests/D3D11FormatTablesTest.cpp

@@ -30,7 +30,8 @@ class D3D11FormatTablesTest : public ANGLETest
 // using it as a texture, a render target, and sampling from it in the shader. It
 // checks this against our speed-optimized baked tables, and validates they would
 // give the same result.
-// TODO(jmadill): Find out why in 9_3, some format queries return an error
+// TODO(jmadill): Find out why in 9_3, some format queries return an error.
+// The error seems to appear for formats that are not supported on 9_3.
 TEST_P(D3D11FormatTablesTest, TestFormatSupport)
 {
     ASSERT_EQ(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, GetParam().getRenderer());
@@ -75,39 +76,57 @@ TEST_P(D3D11FormatTablesTest, TestFormatSupport)
 
         // Bits for renderable
         bool renderable = false;
+        UINT renderSupport       = 0u;
+        DXGI_FORMAT renderFormat = DXGI_FORMAT_UNKNOWN;
         if (internalFormatInfo.depthBits > 0 || internalFormatInfo.stencilBits > 0)
         {
-            UINT depthSupport;
-            bool depthSuccess = SUCCEEDED(device->CheckFormatSupport(formatInfo.dsvFormat, &depthSupport));
-            renderable = depthSuccess && ((depthSupport & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) != 0);
+            renderFormat = formatInfo.dsvFormat;
+            bool depthSuccess =
+                SUCCEEDED(device->CheckFormatSupport(formatInfo.dsvFormat, &renderSupport));
+            renderable =
+                depthSuccess && ((renderSupport & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) != 0);
+            if (renderable)
+            {
+                EXPECT_NE(DXGI_FORMAT_UNKNOWN, formatInfo.dsvFormat);
+            }
         }
         else
         {
-            UINT rtSupport;
-            bool rtSuccess = SUCCEEDED(device->CheckFormatSupport(formatInfo.rtvFormat, &rtSupport));
-            renderable = rtSuccess && ((rtSupport & D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0);
+            renderFormat = formatInfo.rtvFormat;
+            bool rtSuccess =
+                SUCCEEDED(device->CheckFormatSupport(formatInfo.rtvFormat, &renderSupport));
+            renderable = rtSuccess && ((renderSupport & D3D11_FORMAT_SUPPORT_RENDER_TARGET) != 0);
+            if (renderable)
+            {
+                EXPECT_NE(DXGI_FORMAT_UNKNOWN, formatInfo.rtvFormat);
+            }
         }
         EXPECT_EQ(renderable, textureInfo.renderable);
+        if (!textureInfo.sampleCounts.empty())
+        {
+            EXPECT_TRUE(renderable);
+        }
 
         // Multisample counts
-        UINT renderSupport = false;
-        bool renderSuccess = SUCCEEDED(device->CheckFormatSupport(formatInfo.renderFormat, &renderSupport));
-
-        if (renderSuccess && ((renderSupport & D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET) != 0))
+        if (renderable)
         {
-            EXPECT_TRUE(!textureInfo.sampleCounts.empty());
-            for (unsigned int sampleCount = 1; sampleCount <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT;
-                 sampleCount *= 2)
+            if ((renderSupport & D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET) != 0)
             {
-                UINT qualityCount = 0;
-                bool sampleSuccess = SUCCEEDED(device->CheckMultisampleQualityLevels(formatInfo.renderFormat, sampleCount, &qualityCount));
-                GLuint expectedCount = (!sampleSuccess || qualityCount == 0) ? 0 : 1;
-                EXPECT_EQ(expectedCount, textureInfo.sampleCounts.count(sampleCount));
+                EXPECT_TRUE(!textureInfo.sampleCounts.empty());
+                for (unsigned int sampleCount = 1;
+                     sampleCount <= D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; sampleCount *= 2)
+                {
+                    UINT qualityCount  = 0;
+                    bool sampleSuccess = SUCCEEDED(device->CheckMultisampleQualityLevels(
+                        renderFormat, sampleCount, &qualityCount));
+                    GLuint expectedCount = (!sampleSuccess || qualityCount == 0) ? 0 : 1;
+                    EXPECT_EQ(expectedCount, textureInfo.sampleCounts.count(sampleCount));
+                }
+            }
+            else
+            {
+                EXPECT_TRUE(textureInfo.sampleCounts.empty());
             }
-        }
-        else
-        {
-            EXPECT_TRUE(textureInfo.sampleCounts.empty());
         }
     }
 }