Issue 6716044: Use GrCustomStage to implement color matrix.

Issue 6716044: Use GrCustomStage to implement color matrix. (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
12 years, 2 months ago by bsalomon

Modified:
12 years, 2 months ago

Reviewers:
robertphillips

CC:
skia-review_googlegroups.com

Base URL:
http://skia.googlecode.com/svn/trunk/

Visibility:
Public.

More Reviews

Description

Use GrCustomStage to implement color matrix. R=robertphillips@google.com Committed: https://code.google.com/p/skia/source/detail?r=5975

Patch Set 6 : #

Created: 12 years, 2 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+197 lines, -167 lines)			Patch
M	include/core/SkColorFilter.h	View	1 2 3 4 5	2 chunks	+7 lines, -0 lines	0 comments	Download
M	include/effects/SkColorMatrix.h	View	1 2 3 4 5	1 chunk	+6 lines, -0 lines	0 comments	Download
M	include/effects/SkColorMatrixFilter.h	View	1 2 3 4 5	1 chunk	+3 lines, -0 lines	0 comments	Download
M	include/gpu/GrCustomStageUnitTest.h	View	1 2 3 4 5	1 chunk	+1 line, -1 line	0 comments	Download
M	include/gpu/GrPaint.h	View	1 2 3 4 5	5 chunks	+3 lines, -27 lines	0 comments	Download
M	src/core/SkColorFilter.cpp	View	1 2 3 4 5	1 chunk	+4 lines, -0 lines	0 comments	Download
M	src/effects/SkColorMatrixFilter.cpp	View	1 2 3 4 5	1 chunk	+112 lines, -0 lines	0 comments	Download
M	src/gpu/GrDrawState.h	View	1 2 3 4 5	5 chunks	+0 lines, -35 lines	0 comments	Download
M	src/gpu/GrDrawState.cpp	View	1 2 3 4 5	1 chunk	+0 lines, -6 lines	0 comments	Download
M	src/gpu/SkGpuDevice.cpp	View	1 2 3 4 5	1 chunk	+26 lines, -17 lines	0 comments	Download
M	src/gpu/gl/GrGLProgram.h	View	1 2 3 4 5	2 chunks	+0 lines, -5 lines	0 comments	Download
M	src/gpu/gl/GrGLProgram.cpp	View	1 2 3 4 5	4 chunks	+4 lines, -24 lines	0 comments	Download
M	src/gpu/gl/GrGpuGL.h	View	1 2 3 4 5	2 chunks	+1 line, -9 lines	0 comments	Download
M	src/gpu/gl/GrGpuGL.cpp	View	1 2 3 4 5	1 chunk	+6 lines, -4 lines	0 comments	Download
M	src/gpu/gl/GrGpuGL_program.cpp	View	1 2 3 4 5	6 chunks	+20 lines, -35 lines	0 comments	Download
M	tests/GLProgramsTest.cpp	View	1 2 3 4 5	3 chunks	+4 lines, -4 lines	0 comments	Download

Messages

Total messages: 6

Expand All Messages | Collapse All Messages

bsalomon

Also adds SkColorFilter::asNewCustomStage and removes color filter from the monolithic shader generator.

12 years, 2 months ago (2012-10-16 13:31:57 UTC) #1

robertphillips

LGTM + some questions & suggestions https://codereview.appspot.com/6716044/diff/4001/src/effects/SkColorMatrixFilter.cpp File src/effects/SkColorMatrixFilter.cpp (right): https://codereview.appspot.com/6716044/diff/4001/src/effects/SkColorMatrixFilter.cpp#newcode343 src/effects/SkColorMatrixFilter.cpp:343: public: comment on ...

12 years, 2 months ago (2012-10-16 14:42:39 UTC) #2

bsalomon

I really screwed up the upload before publish. It wasn't the most up to date ...

12 years, 2 months ago (2012-10-16 21:14:47 UTC) #3

robertphillips

LGTM + 1 question https://codereview.appspot.com/6716044/diff/1014/src/effects/SkColorMatrixFilter.cpp File src/effects/SkColorMatrixFilter.cpp (right): https://codereview.appspot.com/6716044/diff/1014/src/effects/SkColorMatrixFilter.cpp#newcode375 src/effects/SkColorMatrixFilter.cpp:375: // the unpremul step. Can't ...

12 years, 2 months ago (2012-10-16 21:39:03 UTC) #4

bsalomon

The updated patch addresses the issue. The only file that changed was SkColorMatrixFilter.cpp. https://codereview.appspot.com/6716044/diff/1014/src/effects/SkColorMatrixFilter.cpp File ...

12 years, 2 months ago (2012-10-17 13:23:43 UTC) #5

LGTM

Expand All Messages | Collapse All Messages