src/gpu/GrContext.cpp - Issue 1190463006: Revert of Work around for nexus 6 TexSubImage issue

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/GrContext.cpp

Issue 1190463006: Revert of Work around for nexus 6 TexSubImage issue (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 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:

Index: src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp

index dcb22e066017c2dd9ca1591eb20178cd210dd9b4..64f4cb3deca237649047db0ababf9954813ca01e 100755

--- a/src/gpu/GrContext.cpp

+++ b/src/gpu/GrContext.cpp

@@ -324,9 +324,7 @@

{

GrTexture* texture = NULL;

if (!(kUnpremul_PixelOpsFlag & pixelOpsFlags) && (texture = surface->asTexture()) &&

- fGpu->canWriteTexturePixels(texture, srcConfig) &&

- (!fCaps->useDrawInsteadOfPartialTextureWrite() ||

- (width == texture->width() && height == texture->height()))) {

+ fGpu->canWriteTexturePixels(texture, srcConfig)) {

if (!(kDontFlush_PixelOpsFlag & pixelOpsFlags) &&

surface->surfacePriv().hasPendingIO()) {

« no previous file with comments | « src/gpu/GrCaps.cpp ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »