Add two new fields to angle::Format.

src/libANGLE/renderer/Format.h

@@ -34,7 +34,9 @@ struct Format final : private angle::NonCopyable
                      GLuint blueBits,
                      GLuint alphaBits,
                      GLuint depthBits,
-                     GLuint stencilBits);
+                     GLuint stencilBits,
+                     GLuint pixelBytes,
+                     bool isBlock);
 
     static const Format &Get(ID id);
     static ID InternalFormatToID(GLenum internalFormat);
@@ -65,6 +67,10 @@ struct Format final : private angle::NonCopyable
     GLuint alphaBits;
     GLuint depthBits;
     GLuint stencilBits;
+
+    GLuint pixelBytes;
+
+    bool isBlock;
 };
 
 constexpr Format::Format(ID id,
@@ -80,7 +86,9 @@ constexpr Format::Format(ID id,
                          GLuint blueBits,
                          GLuint alphaBits,
                          GLuint depthBits,
-                         GLuint stencilBits)
+                         GLuint stencilBits,
+                         GLuint pixelBytes,
+                         bool isBlock)
     : id(id),
       glInternalFormat(glFormat),
       fboImplementationInternalFormat(fboFormat),
@@ -94,7 +102,9 @@ constexpr Format::Format(ID id,
       blueBits(blueBits),
       alphaBits(alphaBits),
       depthBits(depthBits),
-      stencilBits(stencilBits)
+      stencilBits(stencilBits),
+      pixelBytes(pixelBytes),
+      isBlock(isBlock)
 {
 }
 

src/libANGLE/renderer/gen_angle_format_table.py

@@ -63,7 +63,7 @@ static constexpr rx::FastCopyFunctionMap NoCopyFunctions;
 
 constexpr Format g_formatInfoTable[] = {{
     // clang-format off
-    {{ Format::ID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0 }},
+    {{ Format::ID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0, 0, false }},
 {angle_format_info_cases}    // clang-format on
 }};
 
@@ -146,7 +146,7 @@ def get_color_write_function(angle_format):
     return 'WriteColor<' + channel_struct + ', '+ write_component_type + '>'
 
 
-format_entry_template = """    {{ Format::ID::{id}, {glInternalFormat}, {fboImplementationInternalFormat}, {mipGenerationFunction}, {fastCopyFunctions}, {colorReadFunction}, {colorWriteFunction}, {namedComponentType}, {R}, {G}, {B}, {A}, {D}, {S} }},
+format_entry_template = """    {{ Format::ID::{id}, {glInternalFormat}, {fboImplementationInternalFormat}, {mipGenerationFunction}, {fastCopyFunctions}, {colorReadFunction}, {colorWriteFunction}, {namedComponentType}, {R}, {G}, {B}, {A}, {D}, {S}, {pixelBytes}, {isBlock} }},
 """
 
 def get_named_component_type(component_type):
@@ -208,6 +208,12 @@ def json_to_table_data(format_id, json, angle_to_gl):
     if format_id == "B8G8R8A8_UNORM":
         parsed["fastCopyFunctions"] = "BGRACopyFunctions"
 
+    sum_of_bits = 0
+    for channel in ["R", "G", "B", "A", "D", "S"]:
+        sum_of_bits += int(parsed[channel])
+    parsed["pixelBytes"] = sum_of_bits / 8
+    parsed["isBlock"] = "true" if format_id.endswith("_BLOCK") else "false"
+
     return format_entry_template.format(**parsed)
 
 def parse_angle_format_table(all_angle, json_data, angle_to_gl):

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -278,10 +278,7 @@ gl::Error FramebufferVk::readPixels(const gl::Context *context,
                                                  0, &mapPointer));
 
     const angle::Format &angleFormat = renderTarget->image->getFormat().textureFormat();
-
-    // TODO(jmadill): Use pixel bytes from the ANGLE format directly.
-    const auto &glFormat = gl::GetSizedInternalFormatInfo(angleFormat.glInternalFormat);
-    int outputPitch      = glFormat.pixelBytes * area.width;
+    GLuint outputPitch               = angleFormat.pixelBytes * area.width;
 
     // Get the staging image pitch and use it to pack the pixels later.
     VkSubresourceLayout subresourceLayout;

src/libANGLE/renderer/vulkan/vk_format_utils.cpp

@@ -125,8 +125,6 @@ void FormatTable::initialize(VkPhysicalDevice physicalDevice,
 
         if (!mFormatData[formatIndex].valid())
         {
-            // TODO(lucferron): Implement support for more OpenGL Texture formats
-            // http://anglebug.com/2358
             continue;
         }
 
@@ -140,9 +138,7 @@ void FormatTable::initialize(VkPhysicalDevice physicalDevice,
         FillTextureFormatCaps(formatProperties, &textureCaps);
         outTextureCapsMap->set(formatID, textureCaps);
 
-        // TODO(lucferron): Optimize this by including compressed bool in the FormatID
-        // http://anglebug.com/2358
-        if (gl::GetSizedInternalFormatInfo(internalFormat).compressed)
+        if (angleFormat.isBlock)
         {
             outCompressedTextureFormats->push_back(internalFormat);
         }