OLD | NEW |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 | 9 |
10 #include "SkGLWidget.h" | 10 #include "SkGLWidget.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
55 glClear(GL_STENCIL_BUFFER_BIT); | 55 glClear(GL_STENCIL_BUFFER_BIT); |
56 fCurContext->resetContext(); | 56 fCurContext->resetContext(); |
57 | 57 |
58 fGpuDevice.reset(nullptr); | 58 fGpuDevice.reset(nullptr); |
59 fCanvas.reset(nullptr); | 59 fCanvas.reset(nullptr); |
60 | 60 |
61 GrBackendRenderTargetDesc desc = this->getDesc(this->width(), this->height() ); | 61 GrBackendRenderTargetDesc desc = this->getDesc(this->width(), this->height() ); |
62 desc.fOrigin = kBottomLeft_GrSurfaceOrigin; | 62 desc.fOrigin = kBottomLeft_GrSurfaceOrigin; |
63 sk_sp<GrRenderTarget> curRenderTarget( | 63 sk_sp<GrRenderTarget> curRenderTarget( |
64 fCurContext->textureProvider()->wrapBackendRenderTarget(desc)); | 64 fCurContext->textureProvider()->wrapBackendRenderTarget(desc)); |
65 sk_sp<SkColorSpace> colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_ Named); | |
65 SkSurfaceProps props(0, kUnknown_SkPixelGeometry); | 66 SkSurfaceProps props(0, kUnknown_SkPixelGeometry); |
66 fGpuDevice.reset(SkGpuDevice::Make(std::move(curRenderTarget), &props, | 67 fGpuDevice.reset(SkGpuDevice::Make(std::move(curRenderTarget), colorSpace, & props, |
Brian Osman
2016/07/25 17:54:42
If you want to preserve the previous behavior, you
f(malita)
2016/07/25 17:55:46
+1
Let's just pass nullptr.
chrishtr
2016/07/25 17:58:40
Done.
| |
67 SkGpuDevice::kUninit_InitContents).releas e()); | 68 SkGpuDevice::kUninit_InitContents).releas e()); |
68 fCanvas.reset(new SkCanvas(fGpuDevice)); | 69 fCanvas.reset(new SkCanvas(fGpuDevice)); |
69 } | 70 } |
70 | 71 |
71 void SkGLWidget::resizeGL(int w, int h) { | 72 void SkGLWidget::resizeGL(int w, int h) { |
72 SkASSERT(w == this->width() && h == this->height()); | 73 SkASSERT(w == this->width() && h == this->height()); |
73 this->createRenderTarget(); | 74 this->createRenderTarget(); |
74 } | 75 } |
75 | 76 |
76 void SkGLWidget::paintGL() { | 77 void SkGLWidget::paintGL() { |
(...skipping 14 matching lines...) Expand all Loading... | |
91 GR_GL_GetIntegerv(fCurIntf, GR_GL_SAMPLES, &desc.fSampleCnt); | 92 GR_GL_GetIntegerv(fCurIntf, GR_GL_SAMPLES, &desc.fSampleCnt); |
92 GR_GL_GetIntegerv(fCurIntf, GR_GL_STENCIL_BITS, &desc.fStencilBits); | 93 GR_GL_GetIntegerv(fCurIntf, GR_GL_STENCIL_BITS, &desc.fStencilBits); |
93 GrGLint buffer; | 94 GrGLint buffer; |
94 GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &buffer); | 95 GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &buffer); |
95 desc.fRenderTargetHandle = buffer; | 96 desc.fRenderTargetHandle = buffer; |
96 | 97 |
97 return desc; | 98 return desc; |
98 } | 99 } |
99 | 100 |
100 #endif | 101 #endif |
OLD | NEW |