diff --git a/src/gpu/GrProcessorUnitTest.cpp b/src/gpu/GrProcessorUnitTest.cpp index 21f282bf38a7..fc15fc961097 100644 --- a/src/gpu/GrProcessorUnitTest.cpp +++ b/src/gpu/GrProcessorUnitTest.cpp @@ -46,7 +46,7 @@ GrProcessorTestData::ProxyInfo GrProcessorTestData::randomAlphaOnlyProxy() { int idx = fRandom->nextULessThan(numAlphaOnly); for (const auto& [p, ct, at] : fProxies) { if (GrColorTypeIsAlphaOnly(ct) && !idx--) { - return {p, ct, at}; + return std::make_tuple(p, ct, at); } } SkUNREACHABLE; diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp index c9def96d41d9..afb3d3e29cef 100644 --- a/src/gpu/text/GrTextBlob.cpp +++ b/src/gpu/text/GrTextBlob.cpp @@ -830,7 +830,7 @@ std::tuple GrTextBlob::VertexRegenerator::updateTextureCoordinatesMay : fFullAtlasManager->atlasGeneration(fSubRun->maskFormat()); } - return {code != GrDrawOpAtlas::ErrorCode::kError, glyphsPlacedInAtlas}; + return std::make_tuple(code != GrDrawOpAtlas::ErrorCode::kError, glyphsPlacedInAtlas); } std::tuple GrTextBlob::VertexRegenerator::regenerate(int begin, int end) { @@ -853,6 +853,6 @@ std::tuple GrTextBlob::VertexRegenerator::regenerate(int begin, int e fUploadTarget->tokenTracker()->nextDrawToken(), fSubRun->maskFormat()); } - return {true, end - begin}; + return std::make_tuple(true, end - begin); } }