Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 6 insertions, 52 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/Format.h b/gfx/angle/src/libANGLE/renderer/Format.h
index 5c6e7e1fe..65608a7a6 100755
--- a/gfx/angle/src/libANGLE/renderer/Format.h
+++ b/gfx/angle/src/libANGLE/renderer/Format.h
@@ -22,19 +22,11 @@ struct Format final : angle::NonCopyable
 {
     enum class ID;
 
-    constexpr Format(ID id,
-                     GLenum glFormat,
-                     GLenum fboFormat,
-                     rx::MipGenerationFunction mipGen,
-                     const rx::FastCopyFunctionMap &fastCopyFunctions,
-                     rx::ColorReadFunction colorRead,
-                     GLenum componentType,
-                     GLuint redBits,
-                     GLuint greenBits,
-                     GLuint blueBits,
-                     GLuint alphaBits,
-                     GLuint depthBits,
-                     GLuint stencilBits);
+    Format(ID id,
+           GLenum glFormat,
+           GLenum fboFormat,
+           rx::MipGenerationFunction mipGen,
+           rx::ColorReadFunction colorRead);
 
     static const Format &Get(ID id);
 
@@ -53,47 +45,9 @@ struct Format final : angle::NonCopyable
     rx::ColorReadFunction colorReadFunction;
 
     // A map from a gl::FormatType to a fast pixel copy function for this format.
-    const rx::FastCopyFunctionMap &fastCopyFunctions;
-
-    GLenum componentType;
-
-    GLuint redBits;
-    GLuint greenBits;
-    GLuint blueBits;
-    GLuint alphaBits;
-    GLuint depthBits;
-    GLuint stencilBits;
+    rx::FastCopyFunctionMap fastCopyFunctions;
 };
 
-constexpr Format::Format(ID id,
-                         GLenum glFormat,
-                         GLenum fboFormat,
-                         rx::MipGenerationFunction mipGen,
-                         const rx::FastCopyFunctionMap &fastCopyFunctions,
-                         rx::ColorReadFunction colorRead,
-                         GLenum componentType,
-                         GLuint redBits,
-                         GLuint greenBits,
-                         GLuint blueBits,
-                         GLuint alphaBits,
-                         GLuint depthBits,
-                         GLuint stencilBits)
-    : id(id),
-      glInternalFormat(glFormat),
-      fboImplementationInternalFormat(fboFormat),
-      mipGenerationFunction(mipGen),
-      colorReadFunction(colorRead),
-      fastCopyFunctions(fastCopyFunctions),
-      componentType(componentType),
-      redBits(redBits),
-      greenBits(greenBits),
-      blueBits(blueBits),
-      alphaBits(alphaBits),
-      depthBits(depthBits),
-      stencilBits(stencilBits)
-{
-}
-
 }  // namespace angle
 
 #include "libANGLE/renderer/Format_ID_autogen.inl"