AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
20,618 Commits 1 Branch 0 Tags 544 MiB
3c69348e72
Commit Graph

71 Commits

Author SHA1 Message Date
robertphillips
2e1e51f049 GrDrawContext now holds GrRenderTarget pointer 
Review URL: https://codereview.chromium.org/1404823005
 2015-10-15 08:01:49 -07:00
halcanary
2a24338c77 GM: replace boilerplate with macros 
I have verified locally that nothing draws differently.

Motivation:
*   SK_SIMPLE_GM makes it easier to write a GM.
*   Reducing 1100 lines of code makes maintenance easier.
*   Simple GMs are easy to convert to Fiddles.

Review URL: https://codereview.chromium.org/1333553002
 2015-09-09 08:16:41 -07:00
robertphillips
c9a3706f1e Limit lifetime of GrDrawContext objects 
GrDrawContext's are about to become real allocated objects. This CL sets up the machinery so they won't leak.

Review URL: https://codereview.chromium.org/1321353002
 2015-09-01 08:34:28 -07:00
halcanary
96fcdcc219 Style Change: NULL->nullptr 
DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002
 2015-08-27 07:41:16 -07:00
robertphillips
ea46150344 Split drawing functionality out of GrContext and into new GrDrawContext 
This is mainly a mechanical CL. There were some fiddly bits in GrContext.cpp where it no longer had access to the GrDrawTarget (and had to use the new GrDrawContext).

I've converted GrAARectRenderer & GrOvalRenderer into static classes so I could stop allocating them.

Review URL: https://codereview.chromium.org/1151283004
 2015-05-26 11:38:03 -07:00
bsalomon
d309e7aa0e This replaces the texture creation/caching functions on GrContext with a GrTextureProvider interface. The goal is to pass this narrowly focused object in places that currently take a GrContext but don't need and shouldn't use its other methods. It also has an extended private interface for interacting with non-texture resource types. 
Review URL: https://codereview.chromium.org/1107973004
 2015-04-30 14:18:54 -07:00
mtklein
36352bf5e3 C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} 
NOPRESUBMIT=true

BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002

Review URL: https://codereview.chromium.org/1037793002
 2015-03-25 18:17:32 -07:00
joshualitt
570d2f81a6 I'd really like to land this before the branch so speedy reviews are appreciated. 
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/586d5d640b19860dfbbd903a5188da1bbbe87336

Review URL: https://codereview.chromium.org/936943002
 2015-02-25 13:19:48 -08:00
joshualitt
2907059d0e Revert of Pass clip to context (patchset #8 id:180001 of https://codereview.chromium.org/936943002/) 
Reason for revert:
Strange blur problems on nexus 5

Original issue's description:
> I'd really like to land this before the branch so speedy reviews are appreciated.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/586d5d640b19860dfbbd903a5188da1bbbe87336

TBR=jvanverth@google.com,senorblanco@google.com,bsalomon@google.com,senorblanco@chromium.org,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/956083002
 2015-02-25 13:04:44 -08:00
joshualitt
586d5d640b I'd really like to land this before the branch so speedy reviews are appreciated. 
BUG=skia:

Review URL: https://codereview.chromium.org/936943002
 2015-02-25 11:21:21 -08:00
joshualitt
25d9c15408 Pass Rendertarget into context. 
Adding Jim for text context stuff, and Steven for image blur stuff.

BUG=skia:

Review URL: https://codereview.chromium.org/939623005
 2015-02-18 12:29:52 -08:00
bsalomon
d0423587ac One createTexture function, attempt to recycle scratch in createTexture. 
Review URL: https://codereview.chromium.org/864383003
 2015-02-06 08:49:24 -08:00
bsalomon
b62da80cbf Add standard way to indicate GM is GPU-only. 
TBR=egdaniel@google.com,mtklein@google.com

Review URL: https://codereview.chromium.org/869393007
 2015-01-31 07:51:14 -08:00
mtklein
1c4029296f remove unused GM flags 
Depends on https://codereview.chromium.org/873753002/

Thumbs up to CLion for refactoring this for me.

BUG=skia:

Review URL: https://codereview.chromium.org/867963004
 2015-01-23 11:07:08 -08:00
mtklein
72c9faab45 Fix up all the easy virtual ... SK_OVERRIDE cases. 
This fixes every case where virtual and SK_OVERRIDE were on the same line,
which should be the bulk of cases.  We'll have to manually clean up the rest
over time unless I level up in regexes.

for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end

BUG=skia:

Review URL: https://codereview.chromium.org/806653007
 2015-01-09 10:06:40 -08:00
tfarina
752e7eb157 Cleanup: Another round of override fixes. 
BUG=skia:3075
TEST=ninja -C out/Debug
TBR=mtklein@google.com

Review URL: https://codereview.chromium.org/815883002
 2014-12-20 06:53:43 -08:00
joshualitt
5531d51ce7 remove view matrix from context 
BUG=skia:

Review URL: https://codereview.chromium.org/808703006
 2014-12-17 15:50:11 -08:00
egdaniel
9513143efa Make all blending up to GrOptDrawState be handled by the xp/xp factory. 
In this cl the blending information is extracted for the xp and stored in the ODS
which is then used as it currently is. In the follow up cl, an XP backend will be added
and at that point all blending work will take place inside XP's.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/7c66342a399b529634bed0fabfaa562db2c0dbd4

Review URL: https://codereview.chromium.org/759713002
 2014-12-09 11:15:44 -08:00
egdaniel
8d95ffa497 Revert of Make all blending up to GrOptDrawState be handled by the xp/xp factory. (patchset #7 id:140001 of https://codereview.chromium.org/759713002/) 
Reason for revert:
break many gm's

Original issue's description:
> Make all blending up to GrOptDrawState be handled by the xp/xp factory.
>
> In this cl the blending information is extracted for the xp and stored in the ODS
> which is then used as it currently is. In the follow up cl, an XP backend will be added
> and at that point all blending work will take place inside XP's.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/7c66342a399b529634bed0fabfaa562db2c0dbd4

TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/766653008
 2014-12-08 13:26:43 -08:00
egdaniel
7c66342a39 Make all blending up to GrOptDrawState be handled by the xp/xp factory. 
In this cl the blending information is extracted for the xp and stored in the ODS
which is then used as it currently is. In the follow up cl, an XP backend will be added
and at that point all blending work will take place inside XP's.

BUG=skia:

Review URL: https://codereview.chromium.org/759713002
 2014-12-08 11:20:40 -08:00
bsalomon
f2703d83da rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags 
Review URL: https://codereview.chromium.org/682223002
 2014-10-28 14:33:06 -07:00
joshualitt
b0a8a377f8 Patch to create a distinct geometry processor. The vast majority of this patch 
is just a rename.  The meat is in GrGeometryProcessor, GrProcessor,
GrGL*Processor, GrProcessorStage, Gr*BackendProcessorFactory,
GrProcessUnitTestFactory, and the builders

BUG=skia:
R=bsalomon@google.com

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/582963002
 2014-09-23 09:50:21 -07:00
bsalomon
dcabb05113 Make GrCacheable implement its own ref counting. 
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/392333008
 2014-07-21 14:24:01 -07:00
tfarina
f539318f0d Cleanup: Get rid of make_isize() function from gm.h. 
This helper function is not necessary.

The same thing can be achieved by using SkISize::Make() provided by
SkTSize API.

BUG=skia:2645
TEST=make dm && out/Debug/dm
R=robertphillips@google.com, reed@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/326523002
 2014-06-09 23:59:03 -07:00
reed@google.com
9c135db83d support direct writing to top layer, and hide getTopLayer() 
this should remove many of the chrome callers that today call
accessBitmap on the toplayer, so they can read/write those pixels.

The ultimate fix will be to support custom allocation of raster layers
(via GDI/cairo/mac) so we can remove PlatformDevice subclassing in
skia/ext

BUG=skia:
R=bsalomon@google.com, scroggo@google.com

Review URL: https://codereview.chromium.org/197433002

git-svn-id: http://skia.googlecode.com/svn/trunk@13774 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-12 18:28:35 +00:00
commit-bot@chromium.org
644629c1c7 Implement a benchmark for GrResourceCache 
Adds "grresourcecache_add" and "grresourcecache_find" bench tests to test
GrResourceCache::add and GrResourceCache::find. The tests work only
with GPU backends, since GrResourceCache needs an GrGpu.

Modifies bench tests to override SkBenchmark::isSuitableFor(Backend)
function that specifies what kind of backend the test is inteded
for. This replaces the previous "fIsRendering" flag that would
indicate test that did no rendering.

Adds SkCanvas::getGrContext() call to get the GrContext that the
canvas ends up drawing to. The member function solves a common
use-case that is also used in the benchmark added here.

R=mtklein@google.com, bsalomon@google.com

Author: kkinnunen@nvidia.com

Review URL: https://codereview.chromium.org/73643005

git-svn-id: http://skia.googlecode.com/svn/trunk@12334 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-21 06:21:58 +00:00
commit-bot@chromium.org
beede90eae texdata gm: allocate gTextureData on the heap. 
This GM is triggering a stack overflow on my laptop when I run it with dm.  As
I understand it, the default stack size on a Mac is 64K, but this allocates 640K.

BUG=
R=bsalomon@google.com, robertphillips@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/26440006

git-svn-id: http://skia.googlecode.com/svn/trunk@11801 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-16 11:50:50 +00:00
commit-bot@chromium.org
1d5bbb26cf Spin off incidental changes from DM CL (22839016). 
BUG=
R=epoger@google.com, bsalomon@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/27023004

git-svn-id: http://skia.googlecode.com/svn/trunk@11752 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-14 14:15:28 +00:00
mtklein@google.com
62b50b7bb8 Have GMs read the GrContext via a setter/getter rather than a global. 
GetGr's current global state makes things rather tricky to run GPU GMs in
parallel (DM).  This API change will let me feed the right GrContext to the
right GM in DM.

I'm not planning on changing the status quo in GM-the-tool: the new getters and
setters still just return the same global.

BUG=skia:1590
R=bsalomon@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/23567032

git-svn-id: http://skia.googlecode.com/svn/trunk@11306 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-09-16 20:42:15 +00:00
commit-bot@chromium.org
a4de8c257e Remove GrRefCnt.h in favor of SkRefCnt.h 
This removes GrRefCnt.h with all its tyepdefs and #defines and just switch them
to the Sk* equivalents.

GrSafeSetNull was promoted to SkSafeSetNull in SkRefCnt.h.

BUG=None
TEST=none, no functional changes.
R=bsalomon@google.com, robertphillips@google.com

Author: tfarina@chromium.org

Review URL: https://chromiumcodereview.appspot.com/23904003

git-svn-id: http://skia.googlecode.com/svn/trunk@11151 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-09-09 13:38:37 +00:00
robertphillips@google.com
1f2f338e23 Split SkDevice into SkBaseDevice and SkBitmapDevice 
https://codereview.chromium.org/22978012/



git-svn-id: http://skia.googlecode.com/svn/trunk@10995 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-29 11:54:56 +00:00
robertphillips@google.com
9b051a375b Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 20:06:40 +00:00
robertphillips@google.com
3055b70018 Split SkDevice out of SkBitmapDevice 
https://codereview.chromium.org/22978012/



git-svn-id: http://skia.googlecode.com/svn/trunk@10830 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 17:49:04 +00:00
commit-bot@chromium.org
fd03d4a829 Replace all instances of GrRect with SkRect. 
And remove the typedef in GrRect.h. The same with GrIRect.

R=robertphillips@google.com

Author: tfarina@chromium.org

Review URL: https://chromiumcodereview.appspot.com/19449002

git-svn-id: http://skia.googlecode.com/svn/trunk@10130 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-17 21:39:42 +00:00
commit-bot@chromium.org
42dacab4e7 Make GrPaint have a variable sized array of color and coverage stages rather than a fixed size. 
R=robertphillips@google.com, jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/18686007

git-svn-id: http://skia.googlecode.com/svn/trunk@10062 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-13 17:24:24 +00:00
commit-bot@chromium.org
b8d00db075 Change undefined SkGpuRenderTarget and SkGpuTexture forward declares to GrRenderTarget and GrTexture. 
R=robertphillips@google.com, reed@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/17269003

git-svn-id: http://skia.googlecode.com/svn/trunk@9775 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-26 19:18:23 +00:00
bsalomon@google.com
c978478514 Make gms use getTopDevice() rather than getDevice(). 
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/14885012

git-svn-id: http://skia.googlecode.com/svn/trunk@9091 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-10 14:12:08 +00:00
bsalomon@google.com
fec0bc3fc1 Remove legacy names no longer referenced in Chrome and WebKit. 
Review URL: https://codereview.appspot.com/7311055

git-svn-id: http://skia.googlecode.com/svn/trunk@7640 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-02-07 14:43:04 +00:00
bsalomon@google.com
68b58c9538 Remove default implementation of GrEffect::isEqual. Make GrSingleTextureEffect abstract. 
Review URL: https://codereview.appspot.com/7142049

git-svn-id: http://skia.googlecode.com/svn/trunk@7254 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-17 16:50:08 +00:00
bsalomon@google.com
0ac6af4997 Wrap GrEffects in GrEffectPtr. 
This is the first step towards automatic recycling of scratch resouces in the cache via ref-cnts.

R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7092061

git-svn-id: http://skia.googlecode.com/svn/trunk@7222 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-16 15:16:18 +00:00
bsalomon@google.com
b9086a0268 Replace GrMatrix with SkMatrix. 
Review URL: https://codereview.appspot.com/6814067

git-svn-id: http://skia.googlecode.com/svn/trunk@6247 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-01 18:02:54 +00:00
bsalomon@google.com
d8b5faca04 Reland r6233 with fix. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6241 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-01 17:02:46 +00:00
bsalomon@google.com
115b06f3d5 Re-revert r6233. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6239 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-01 15:47:55 +00:00
bsalomon@google.com
c3a58f345d Reland r6233 with fix for config conversion texture matrices. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6238 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-01 15:40:47 +00:00
bsalomon@google.com
66e534da8e Revert r6233 while investigating bot failures. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6235 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-01 14:02:43 +00:00
bsalomon@google.com
ce49e16d3b Checkpoint in moving texture matrices out of GrGLProgram and into GrGLEffect. 
Review URL: https://codereview.appspot.com/6818064

git-svn-id: http://skia.googlecode.com/svn/trunk@6233 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-01 13:50:50 +00:00
bsalomon@google.com
08283afc26 Rename GrSamplerState to GrEffectStage. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6777053

git-svn-id: http://skia.googlecode.com/svn/trunk@6135 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 13:01:20 +00:00
bsalomon@google.com
6f261bed02 GrCustomStage Renaming Part 2 
GrSamplerState member rename
GrCustomStageUnitTest rename
some comment updates
Review URL: https://codereview.appspot.com/6771043

git-svn-id: http://skia.googlecode.com/svn/trunk@6078 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-24 19:07:10 +00:00
bsalomon@google.com
dfdb7e5240 Reland r5963 with two fixes: 
Missing ref in GrSweepGradient::TestCreate.
Must reset() the sampler in setup_drawstate_aaclip() to avoid hitting a (dubious) assert.



git-svn-id: http://skia.googlecode.com/svn/trunk@5964 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-16 15:19:45 +00:00
bsalomon@google.com
f6eac8af58 Revert r5962 because of failures. 
git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-16 14:31:26 +00:00