src/gpu/gl/GrGLGpu.cpp - Issue 1944953002: Revert of Add Gr*Proxy classes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/gl/GrGLGpu.cpp

Issue 1944953002: Revert of Add Gr*Proxy classes (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 8 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:

Index: src/gpu/gl/GrGLGpu.cpp

diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp

index 027d9527c09bd7800a725badd67325cefa254a21..9d2984f186e7198b63362394c86b86ff893e9818 100644

--- a/src/gpu/gl/GrGLGpu.cpp

+++ b/src/gpu/gl/GrGLGpu.cpp

@@ -1474,9 +1474,9 @@

idDesc->fRTFBOID = 0;

idDesc->fRTFBOOwnership = GrBackendObjectOwnership::kOwned;

idDesc->fTexFBOID = 0;

- SkASSERT((GrGLCaps::kMixedSamples_MSFBOType == this->glCaps().msFBOType()) ==

- this->caps()->usesMixedSamples());

- idDesc->fSampleConfig = GrRenderTarget::ComputeSampleConfig(*this->caps(), desc.fSampleCnt);

+ idDesc->fSampleConfig = (GrGLCaps::kMixedSamples_MSFBOType == this->glCaps().msFBOType() &&

+ desc.fSampleCnt > 0) ? GrRenderTarget::kStencil_SampleConfig :

+ GrRenderTarget::kUnified_SampleConfig;

GrGLenum status;

« no previous file with comments | « src/gpu/GrTextureProxy.cpp ('k') | src/image/SkImage_Gpu.cpp » ('j') | no next file with comments »