Bug 1338429 - Convert texture upload conversion warnings to perf-warnings. - r=daoshengmu
MozReview-Commit-ID: 49nxQY6rQDY
--- a/dom/canvas/TexUnpackBlob.cpp
+++ b/dom/canvas/TexUnpackBlob.cpp
@@ -309,25 +309,26 @@ TexUnpackBlob::ConvertIfNeeded(WebGLCont
return true;
const auto& dstIsPremult = webgl->mPixelStore_PremultiplyAlpha;
const auto srcOrigin = (webgl->mPixelStore_FlipY ? gl::OriginPos::TopLeft
: gl::OriginPos::BottomLeft);
const auto dstOrigin = gl::OriginPos::BottomLeft;
if (srcFormat != dstFormat) {
- webgl->GenerateWarning("%s: Conversion requires pixel reformatting.", funcName);
+ webgl->GeneratePerfWarning("%s: Conversion requires pixel reformatting.",
+ funcName);
} else if (mSrcIsPremult != dstIsPremult) {
- webgl->GenerateWarning("%s: Conversion requires change in"
- "alpha-premultiplication.",
- funcName);
+ webgl->GeneratePerfWarning("%s: Conversion requires change in"
+ "alpha-premultiplication.",
+ funcName);
} else if (srcOrigin != dstOrigin) {
- webgl->GenerateWarning("%s: Conversion requires y-flip.", funcName);
+ webgl->GeneratePerfWarning("%s: Conversion requires y-flip.", funcName);
} else if (srcStride != dstStride) {
- webgl->GenerateWarning("%s: Conversion requires change in stride.", funcName);
+ webgl->GeneratePerfWarning("%s: Conversion requires change in stride.", funcName);
} else {
return true;
}
////
const auto dstTotalBytes = CheckedUint32(rowCount) * dstStride;
if (!dstTotalBytes.isValid()) {
@@ -637,19 +638,19 @@ TexUnpackImage::TexOrSubImage(bool isSub
break;
}
// Blitting was successful, so we're done!
*out_error = 0;
return true;
} while (false);
- webgl->GenerateWarning("%s: Failed to hit GPU-copy fast-path. Falling back to CPU"
- " upload.",
- funcName);
+ webgl->GeneratePerfWarning("%s: Failed to hit GPU-copy fast-path. Falling back to CPU"
+ " upload.",
+ funcName);
const RefPtr<gfx::SourceSurface> surf = mImage->GetAsSourceSurface();
RefPtr<gfx::DataSourceSurface> dataSurf;
if (surf) {
// WARNING: OSX can lose our MakeCurrent here.
dataSurf = surf->GetDataSurface();
}