Remove compiler bug workaround

The ICE was (indirectly) triggered by the swizzle code, which has been
removed. Verified that this code now compiles on MSVC without incident.

Change-Id: I730ad8d39c02a37daa91c2248bd680339b7c8de2
Reviewed-on: https://skia-review.googlesource.com/10963
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2017-03-31 12:15:23 -04:00 committed by Skia Commit-Bot
parent 1d1165ca65
commit ebf5acc704

View File

@ -109,12 +109,6 @@ bool GrConfigConversionEffect::onIsEqual(const GrFragmentProcessor& s) const {
GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConfigConversionEffect);
#if !defined(__clang__) && _MSC_FULL_VER >= 190024213
// Work around VS 2015 Update 3 optimizer bug that causes internal compiler error
//https://connect.microsoft.com/VisualStudio/feedback/details/3100520/internal-compiler-error
#pragma optimize("t", off)
#endif
#if GR_TEST_UTILS
sk_sp<GrFragmentProcessor> GrConfigConversionEffect::TestCreate(GrProcessorTestData* d) {
PMConversion pmConv = static_cast<PMConversion>(d->fRandom->nextULessThan(kPMConversionCnt));
@ -125,11 +119,6 @@ sk_sp<GrFragmentProcessor> GrConfigConversionEffect::TestCreate(GrProcessorTestD
}
#endif
#if !defined(__clang__) && _MSC_FULL_VER >= 190024213
// Restore optimization settings.
#pragma optimize("", on)
#endif
///////////////////////////////////////////////////////////////////////////////
void GrConfigConversionEffect::onGetGLSLProcessorKey(const GrShaderCaps& caps,