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

Side by Side Diff: tools/viewer/sk_app/WindowContext.cpp

Issue 2069653002: Use Offscreen Surface for Split Screen (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Better merge Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "GrContext.h" 9 #include "GrContext.h"
10 #include "SkSurface.h" 10 #include "SkSurface.h"
11 #include "WindowContext.h" 11 #include "WindowContext.h"
12 12
13 #include "gl/GrGLDefines.h" 13 #include "gl/GrGLDefines.h"
14 14
15 #include "gl/GrGLUtil.h" 15 #include "gl/GrGLUtil.h"
16 #include "GrRenderTarget.h" 16 #include "GrRenderTarget.h"
17 #include "GrContext.h" 17 #include "GrContext.h"
18 18
19 #include "SkCanvas.h" 19 #include "SkCanvas.h"
20 #include "SkImage_Base.h" 20 #include "SkImage_Base.h"
21 21
22 namespace sk_app { 22 namespace sk_app {
23 23
24 sk_sp<SkSurface> WindowContext::createOffscreenSurface(bool forceSRGB) {
25 return createSurface(nullptr, 0, true, forceSRGB);
26 }
27
24 sk_sp<SkSurface> WindowContext::createRenderSurface(sk_sp<GrRenderTarget> rt, in t colorBits) { 28 sk_sp<SkSurface> WindowContext::createRenderSurface(sk_sp<GrRenderTarget> rt, in t colorBits) {
29 return createSurface(rt, colorBits, false, false);
30 }
31
32 sk_sp<SkSurface> WindowContext::createSurface(
33 sk_sp<GrRenderTarget> rt, int colorBits, bool offscreen, bool forceSRGB) {
25 auto flags = (fSurfaceProps.flags() & ~SkSurfaceProps::kGammaCorrect_Flag) | 34 auto flags = (fSurfaceProps.flags() & ~SkSurfaceProps::kGammaCorrect_Flag) |
26 (GrPixelConfigIsSRGB(fPixelConfig) ? SkSurfaceProps::kGammaCorr ect_Flag : 0); 35 (GrPixelConfigIsSRGB(fPixelConfig) || forceSRGB ?
36 SkSurfaceProps::kGammaCorrect_Flag : 0);
27 SkSurfaceProps props(flags, fSurfaceProps.pixelGeometry()); 37 SkSurfaceProps props(flags, fSurfaceProps.pixelGeometry());
28 38
29 if (!this->isGpuContext() || colorBits > 24 || 39 if (!this->isGpuContext() || colorBits > 24 || offscreen ||
30 kRGBA_F16_SkColorType == fDisplayParams.fColorType) { 40 kRGBA_F16_SkColorType == fDisplayParams.fColorType) {
31 // If we're rendering to F16, we need an off-screen surface - the curren t render 41 // If we're rendering to F16, we need an off-screen surface - the curren t render
32 // target is most likely the wrong format. 42 // target is most likely the wrong format.
33 // 43 //
34 // If we're rendering raster data or using a deep (10-bit or higher) sur face, we probably 44 // If we're rendering raster data or using a deep (10-bit or higher) sur face, we probably
35 // need an off-screen surface. 10-bit, in particular, has strange gamma behavior. 45 // need an off-screen surface. 10-bit, in particular, has strange gamma behavior.
36 SkImageInfo info = SkImageInfo::Make(fWidth, fHeight, 46 SkImageInfo info = SkImageInfo::Make(
37 fDisplayParams.fColorType, 47 fWidth, fHeight,
38 kUnknown_SkAlphaType, 48 fDisplayParams.fColorType,
39 fDisplayParams.fColorSpace); 49 kPremul_SkAlphaType,
40 return SkSurface::MakeRenderTarget(fContext, SkBudgeted::kNo, info, 50 forceSRGB ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)
41 fDisplayParams.fMSAASampleCount, &pro ps); 51 : fDisplayParams.fColorSpace
52 );
53 if (this->isGpuContext()) {
54 return SkSurface::MakeRenderTarget(fContext, SkBudgeted::kNo, info,
55 fDisplayParams.fMSAASampleCount, &props);
56 } else {
57 return SkSurface::MakeRaster(info, &props);
58 }
42 } else { 59 } else {
43 return SkSurface::MakeRenderTargetDirect(rt.get(), &props); 60 return SkSurface::MakeRenderTargetDirect(rt.get(), &props);
44 } 61 }
45 } 62 }
46 63
47 void WindowContext::presentRenderSurface(sk_sp<SkSurface> renderSurface, sk_sp<G rRenderTarget> rt, 64 void WindowContext::presentRenderSurface(sk_sp<SkSurface> renderSurface, sk_sp<G rRenderTarget> rt,
48 int colorBits) { 65 int colorBits) {
49 if (!this->isGpuContext() || colorBits > 24 || 66 if (!this->isGpuContext() || colorBits > 24 ||
50 kRGBA_F16_SkColorType == fDisplayParams.fColorType) { 67 kRGBA_F16_SkColorType == fDisplayParams.fColorType) {
51 // We made/have an off-screen surface. Get the contents as an SkImage: 68 // We made/have an off-screen surface. Get the contents as an SkImage:
(...skipping 13 matching lines...) Expand all
65 82
66 // With ten-bit output, we need to manually apply the gamma of the outpu t device 83 // With ten-bit output, we need to manually apply the gamma of the outpu t device
67 // (unless we're in non-gamma correct mode, in which case our data is al ready 84 // (unless we're in non-gamma correct mode, in which case our data is al ready
68 // fake-sRGB, like we're expected to put in the 10-bit buffer): 85 // fake-sRGB, like we're expected to put in the 10-bit buffer):
69 bool doGamma = (colorBits == 30) && SkImageInfoIsGammaCorrect(info); 86 bool doGamma = (colorBits == 30) && SkImageInfoIsGammaCorrect(info);
70 fContext->applyGamma(rt.get(), texture, doGamma ? 1.0f / 2.2f : 1.0f); 87 fContext->applyGamma(rt.get(), texture, doGamma ? 1.0f / 2.2f : 1.0f);
71 } 88 }
72 } 89 }
73 90
74 } //namespace sk_app 91 } //namespace sk_app
OLDNEW
« no previous file with comments | « tools/viewer/sk_app/WindowContext.h ('k') | tools/viewer/sk_app/android/RasterWindowContext_android.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698