Hash :
14126505
Author :
Date :
2019-03-06T21:13:20
Revert "Use a constexpr array for es3 copy conversion table." This reverts commit f30808db86e31b8b301eb9ec07cfe785d60b6a16. Reason for revert: build/android/gyp/assert_static_initializers.py thinks this adds a static initializer. See https://ci.chromium.org/p/chromium/builders/try/android-marshmallow-arm64-rel/208664 Need to revert since this is blocking the roll. Original change's description: > Use a constexpr array for es3 copy conversion table. > > With the relaxed C++14 constexpr rules allowed in Chromium, we can > use a constexpr sorted array to store our table data. This can lead > to very fast lookups while being more maintanable than using auto- > generator scripts for every lookup table. > > Note that to be sure this syntax is permitted, we should land this > through the bots and let it sit for a little while. > > Bug: angleproject:1389 > Change-Id: I9395c40276470108ce3e5786d8f1b8d85462c517 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/777544 > Commit-Queue: Jamie Madill <jmadill@google.com> > Reviewed-by: Yuly Novikov <ynovikov@chromium.org> TBR=ynovikov@chromium.org,jmadill@google.com,syoussefi@chromium.org,jmadill@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: angleproject:1389 Change-Id: I482729b6f16975896b0e5c29999f9a081056e800 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1506238 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
{
"From ES 3.0.1 spec, table 3.15":
[
[ "GL_ALPHA", "GL_RGBA" ],
[ "GL_LUMINANCE", "GL_RED" ],
[ "GL_LUMINANCE", "GL_RG" ],
[ "GL_LUMINANCE", "GL_RGB" ],
[ "GL_LUMINANCE", "GL_RGBA" ],
[ "GL_LUMINANCE_ALPHA", "GL_RGBA" ],
[ "GL_RED", "GL_RED" ],
[ "GL_RED", "GL_RG" ],
[ "GL_RED", "GL_RGB" ],
[ "GL_RED", "GL_RGBA" ],
[ "GL_RG", "GL_RG" ],
[ "GL_RG", "GL_RGB" ],
[ "GL_RG", "GL_RGBA" ],
[ "GL_RGB", "GL_RGB" ],
[ "GL_RGB", "GL_RGBA" ],
[ "GL_RGBA", "GL_RGBA" ]
],
"Necessary for ANGLE back-buffers":
[
[ "GL_ALPHA", "GL_BGRA_EXT" ],
[ "GL_LUMINANCE", "GL_BGRA_EXT" ],
[ "GL_LUMINANCE_ALPHA", "GL_BGRA_EXT" ],
[ "GL_RED", "GL_BGRA_EXT" ],
[ "GL_RG", "GL_BGRA_EXT" ],
[ "GL_RGB", "GL_BGRA_EXT" ],
[ "GL_RGBA", "GL_BGRA_EXT" ],
[ "GL_BGRA_EXT", "GL_BGRA_EXT" ],
[ "GL_RED_INTEGER", "GL_RED_INTEGER" ],
[ "GL_RED_INTEGER", "GL_RG_INTEGER" ],
[ "GL_RED_INTEGER", "GL_RGB_INTEGER" ],
[ "GL_RED_INTEGER", "GL_RGBA_INTEGER" ],
[ "GL_RG_INTEGER", "GL_RG_INTEGER" ],
[ "GL_RG_INTEGER", "GL_RGB_INTEGER" ],
[ "GL_RG_INTEGER", "GL_RGBA_INTEGER" ],
[ "GL_RGB_INTEGER", "GL_RGB_INTEGER" ],
[ "GL_RGB_INTEGER", "GL_RGBA_INTEGER" ],
[ "GL_RGBA_INTEGER", "GL_RGBA_INTEGER" ]
]
}