src/effects/SkMatrixConvolutionImageFilter.cpp - Issue 62163004: Added support for Chrome's gpu command buffer extension BindUniformLocation.

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/effects/SkMatrixConvolutionImageFilter.cpp

Issue 62163004: Added support for Chrome's gpu command buffer extension BindUniformLocation. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Fixed compile error on the bots + feedback. Created 7 years, 1 month 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

Index: src/effects/SkMatrixConvolutionImageFilter.cpp

diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp

index 4864aec65aefd60798df0062a82465521bb9f601..6f213d71184887a8c61c5ee0c27489d374256003 100644

--- a/src/effects/SkMatrixConvolutionImageFilter.cpp

+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp

@@ -537,9 +537,9 @@ void GrGLMatrixConvolutionEffect::setData(const GrGLUniformManager& uman,

float ySign = texture.origin() == kTopLeft_GrSurfaceOrigin ? 1.0f : -1.0f;

imageIncrement[0] = 1.0f / texture.width();

imageIncrement[1] = ySign / texture.height();

- uman.set2fv(fImageIncrementUni, 0, 1, imageIncrement);

- uman.set2fv(fTargetUni, 0, 1, conv.target());

- uman.set1fv(fKernelUni, 0, fKernelSize.width() * fKernelSize.height(), conv.kernel());

+ uman.set2fv(fImageIncrementUni, 1, imageIncrement);

+ uman.set2fv(fTargetUni, 1, conv.target());

+ uman.set1fv(fKernelUni, fKernelSize.width() * fKernelSize.height(), conv.kernel());

uman.set1f(fGainUni, conv.gain());

uman.set1f(fBiasUni, conv.bias());

const SkIRect& bounds = conv.bounds();

« no previous file with comments | « src/effects/SkLightingImageFilter.cpp ('k') | src/effects/SkMorphologyImageFilter.cpp » ('j') | no next file with comments »