diff options
| author |  Brian Osman <brianosman@google.com> | 2018-06-01 12:25:08 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 17:00:26 +0000 |
| commit | 2b23c4bf3186bf3fa71bb105afdcf3b8e5995b52 (patch) | |
| tree | 5bd5b115bb5d133682ba6c44e1b3422086e90a6b /bench/nanobench.cpp | |
| parent | 7abeb28342078af39b19a1448d6147c7258f5203 (diff) | |
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 <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'bench/nanobench.cpp')
| -rw-r--r-- | bench/nanobench.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 0376bdbec3..4d2773e605 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -424,8 +424,7 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c GrContextFactory factory(grContextOpts); if (const GrContext* ctx = factory.get(ctxType, ctxOverrides)) { - GrPixelConfig grPixConfig = - SkImageInfo2GrPixelConfig(colorType, colorSpace, *ctx->contextPriv().caps()); + GrPixelConfig grPixConfig = SkColorType2GrPixelConfig(colorType); int supportedSampleCount = ctx->contextPriv().caps()->getRenderTargetSampleCount(sampleCount, grPixConfig); if (sampleCount != supportedSampleCount) { |