Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Unified Diff: src/gpu/GrDrawingManager.cpp

Issue 2270823002: Some tests around surface creation and snapshotting with color space (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Test wrapped backend textures, too. Make those tests pass. Fix problems when sRGB support is missin… Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/gpu/SkGpuDevice.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawingManager.cpp
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index f4d00dcd3eb27d2ef13c38bd18962df9e3e34569..b750aece13fb3413e6756ad2925197fc87d4c4ac 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -184,6 +184,18 @@ GrPathRenderer* GrDrawingManager::getPathRenderer(const GrPathRenderer::CanDrawP
return pr;
}
+static bool checkConfigAndColorSpace(GrPixelConfig config, SkColorSpace* colorSpace) {
Brian Osman 2016/08/23 19:54:46 I'm sad that I have this code in three places, now
+ switch (config) {
+ case kRGBA_half_GrPixelConfig:
+ return colorSpace && SkColorSpace::kLinear_GammaNamed == colorSpace->gammaNamed();
+ case kSRGBA_8888_GrPixelConfig:
+ case kSBGRA_8888_GrPixelConfig:
+ return colorSpace && colorSpace->gammaCloseToSRGB();
+ default:
+ return !colorSpace;
+ }
+}
+
sk_sp<GrDrawContext> GrDrawingManager::makeDrawContext(sk_sp<GrRenderTarget> rt,
sk_sp<SkColorSpace> colorSpace,
const SkSurfaceProps* surfaceProps) {
@@ -191,6 +203,9 @@ sk_sp<GrDrawContext> GrDrawingManager::makeDrawContext(sk_sp<GrRenderTarget> rt,
return nullptr;
}
+ if (!checkConfigAndColorSpace(rt->config(), colorSpace.get())) {
+ return nullptr;
+ }
bool useDIF = false;
if (surfaceProps) {
« no previous file with comments | « no previous file | src/gpu/SkGpuDevice.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698