Commit 2e8f3ad6 authored by Sunny Sachanandani's avatar Sunny Sachanandani Committed by Chromium LUCI CQ

viz: Fix incorrect color space DCHECK for HDR texture quads

When rendering HDR video/texture quads, SkiaRenderer disables implicit
color conversion in Skia by making the SkImage color space match the
destination color space.  After the above fix was landed, an old DCHECK
was left in accidentally.  This CL fixes the incorrect DCHECK.

Bug: 1153917
Change-Id: I1ba9da4ae4a78090fb3e96d3196cc141a0b6618a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587831Reviewed-by: default avatarPeng Huang <penghuang@chromium.org>
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836731}
parent 5b38a905
...@@ -1955,9 +1955,11 @@ void SkiaRenderer::DrawTextureQuad(const TextureDrawQuad* quad, ...@@ -1955,9 +1955,11 @@ void SkiaRenderer::DrawTextureQuad(const TextureDrawQuad* quad,
if (needs_color_conversion_filter) { if (needs_color_conversion_filter) {
// Skia won't perform color conversion. // Skia won't perform color conversion.
DCHECK(!image->colorSpace()); const gfx::ColorSpace dst_color_space = CurrentRenderPassColorSpace();
sk_sp<SkColorFilter> color_filter = GetColorSpaceConversionFilter( DCHECK(SkColorSpace::Equals(image->colorSpace(),
src_color_space, CurrentRenderPassColorSpace()); dst_color_space.ToSkColorSpace().get()));
sk_sp<SkColorFilter> color_filter =
GetColorSpaceConversionFilter(src_color_space, dst_color_space);
paint.setColorFilter(color_filter->makeComposed(paint.refColorFilter())); paint.setColorFilter(color_filter->makeComposed(paint.refColorFilter()));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment