Bug 1321094 - Change angle::Format from constexpr to const to pass build with VS2015u2, r?jgilbert draft
authorpeter chang <pchang@mozilla.com>
Wed, 30 Nov 2016 14:45:17 +0800
changeset 445759 2593d1be726947e1d7c4a519a4045c29f776f71a
parent 445717 a69583d2dbc6fdc18f63761a89cf539c356668be
child 538606 7759de0292b091ce83fbd79fa8fb692fcf3e9c8d
push id37602
push userbmo:howareyou322@gmail.com
push dateWed, 30 Nov 2016 06:48:04 +0000
reviewersjgilbert
bugs1321094
milestone53.0a1
Bug 1321094 - Change angle::Format from constexpr to const to pass build with VS2015u2, r?jgilbert MozReview-Commit-ID: 10nWkgMYf5R
gfx/angle/src/libANGLE/renderer/Format_table_autogen.cpp
--- a/gfx/angle/src/libANGLE/renderer/Format_table_autogen.cpp
+++ b/gfx/angle/src/libANGLE/renderer/Format_table_autogen.cpp
@@ -17,17 +17,17 @@
 namespace angle
 {
 
 static constexpr rx::FastCopyFunctionMap::Entry BGRAEntry = {GL_RGBA, GL_UNSIGNED_BYTE,
                                                              CopyBGRA8ToRGBA8};
 static constexpr rx::FastCopyFunctionMap BGRACopyFunctions = {&BGRAEntry, 1};
 static constexpr rx::FastCopyFunctionMap NoCopyFunctions;
 
-constexpr Format g_formatInfoTable[] = {
+const Format g_formatInfoTable[] = {
     // clang-format off
     { Format::ID::NONE, GL_NONE, GL_NONE, nullptr, NoCopyFunctions, nullptr, GL_NONE, 0, 0, 0, 0, 0, 0 },
     { Format::ID::A16_FLOAT, GL_ALPHA16F_EXT, GL_ALPHA16F_EXT, GenerateMip<A16F>, NoCopyFunctions, ReadColor<A16F, GLfloat>, GL_FLOAT, 0, 0, 0, 16, 0, 0 },
     { Format::ID::A32_FLOAT, GL_ALPHA32F_EXT, GL_ALPHA32F_EXT, GenerateMip<A32F>, NoCopyFunctions, ReadColor<A32F, GLfloat>, GL_FLOAT, 0, 0, 0, 32, 0, 0 },
     { Format::ID::A8_UNORM, GL_ALPHA8_EXT, GL_ALPHA8_EXT, GenerateMip<A8>, NoCopyFunctions, ReadColor<A8, GLfloat>, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 8, 0, 0 },
     { Format::ID::ASTC_10x10_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, nullptr, NoCopyFunctions, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
     { Format::ID::ASTC_10x10_UNORM_BLOCK, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, GL_COMPRESSED_RGBA_ASTC_10x10_KHR, nullptr, NoCopyFunctions, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },
     { Format::ID::ASTC_10x5_SRGB_BLOCK, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, nullptr, NoCopyFunctions, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0 },