From 2b23c4bf3186bf3fa71bb105afdcf3b8e5995b52 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Fri, 1 Jun 2018 12:25:08 -0400 Subject: Dest color space no longer impacts mipmaps or texture sampling PS5: Removes SkDestinationSurfaceColorMode, tracking of mipmap mode on GrTexture, sRGB decode state per-texture. Because we were often choosing sRGB configs for RGB color types, legacy rendering would then be incorrect (too dark). So... PS7: Stops ever using sRGB pixel configs when translating image info or color type. Also removes a bunch of GrCaps bits and a GrContextOption that are no longer relevant. PS9: Adjusts surface creation unit test expectations, and changes the raster rules accordingly. At this point, sRGB configs are (obviously) going to be broken. Locally, I ran 8888, gl, and the gbr- versions of both. Across all GMs x configs, there are 13 diffs. 12 are GMs that create surfaces with a color-space attached (and thus, the offscreen is no longer getting sRGB pixel config). The only remainder constructs an SkPictureImageGenerator, (with an attached color space) and renders it to the gbr-gl canvas, which triggers a a tagged surface inside the generator. Bug: skia: Change-Id: Ie5edfa157dd799f3121e8173fc4f97f6c8ed6789 Reviewed-on: https://skia-review.googlesource.com/131282 Commit-Queue: Brian Osman Reviewed-by: Mike Klein Reviewed-by: Brian Salomon --- tests/GrContextFactoryTest.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'tests/GrContextFactoryTest.cpp') diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index 92801eba83..b05f2e29ce 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -47,28 +47,6 @@ DEF_GPUTEST(GrContextFactory_NoPathRenderingIfNVPRDisabled, reporter, options) { } } -DEF_GPUTEST(GrContextFactory_RequiredSRGBSupport, reporter, options) { - // Test that if sRGB support is requested, the context always has that capability - // or the context creation fails. Also test that if the creation fails, a context - // created without that flag would not have had sRGB support. - for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) { - GrContextFactory testFactory(options); - // Test that if sRGB is requested, caps are in sync. - GrContextFactory::ContextType ctxType = static_cast(i); - GrContext* context = - testFactory.get(ctxType, GrContextFactory::ContextOverrides::kRequireSRGBSupport); - - if (context) { - REPORTER_ASSERT(reporter, context->contextPriv().caps()->srgbSupport()); - } else { - context = testFactory.get(ctxType); - if (context) { - REPORTER_ASSERT(reporter, !context->contextPriv().caps()->srgbSupport()); - } - } - } -} - DEF_GPUTEST(GrContextFactory_abandon, reporter, options) { for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) { GrContextFactory testFactory(options); -- cgit v1.2.3