AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,289 Commits 1 Branch 0 Tags 544 MiB
2eaaefd7e6
Commit Graph

352 Commits

Author SHA1 Message Date
bsalomon@google.com
2eaaefd7e6 Pass GrCustomStage to key-generation functions and emitCode(). 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6819046

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6182 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 19:51:22 +00:00
bsalomon@google.com
484ee2a5fe Make GrEffectStage keep a const ptr (rather than non-const) to GrEffect. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6811045

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6166 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-29 16:25:04 +00:00
bsalomon@google.com
2d0baded0f Make the orientation of a texture accessible from and known by GrSurface. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6801044

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6148 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 19:01:17 +00:00
bsalomon@google.com
28a15fb8d6 Make GrGLEffect::setData take GrEffectStage rather than GrEffect. 
This allows the coord-change matrix to be communicated to setData(). An accessor for this matrix is also added to GrEffectStage.

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

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6143 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 17:53:18 +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
skia.committer@gmail.com
27b40e9f36 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@6133 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-26 02:01:24 +00:00
bsalomon@google.com
46fba0d793 Rename StageKey and related stuff. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6785049

git-svn-id: http://skia.googlecode.com/svn/trunk@6130 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 21:42:05 +00:00
bsalomon@google.com
396e61fe44 Rename GrProgramStageFactory to GrBackendEffectFactory. 
Review URL: https://codereview.appspot.com/6773044

git-svn-id: http://skia.googlecode.com/svn/trunk@6125 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 19:00:29 +00:00
bsalomon@google.com
08afc843c0 Files accidentally omitted from r6123. 
git-svn-id: http://skia.googlecode.com/svn/trunk@6124 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 18:56:10 +00:00
bsalomon@google.com
16e3ddea6a Platform/Engine -> Backend 
createPlatform -> wrapBackend

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6123 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 18:43:28 +00:00
bsalomon@google.com
422e81aeb1 GrGLProgramStage Renaming Part 3 
s/GLProgramStage/GLEffect
minor whitespace/spelling fixup

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6095 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 14:11:03 +00:00
bsalomon@google.com
d698f77c13 GrGLProgramStage Renaming Part 1. 
Renamed cpp and h
s/GrGLProgramStage/GrGLEffect/
Review URL: https://codereview.appspot.com/6759054

git-svn-id: http://skia.googlecode.com/svn/trunk@6090 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 13:22:00 +00:00
bsalomon@google.com
021fc736f8 GrCustomStage Renaming Part 5 
Stuff found by searching for "stage".

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6089 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-25 12:47:42 +00:00
bsalomon@google.com
8ea78d83dc GrCustomStage Renaming Part 4 
Rename a bunch of things found by searching for "custom".
Review URL: https://codereview.appspot.com/6765048

git-svn-id: http://skia.googlecode.com/svn/trunk@6085 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-24 20:11:30 +00:00
bsalomon@google.com
f271cc7183 GrCustomStage Renaming Part 3 
Rename all things *CUSTOM_STAGE*, customStage*, and other miscellany

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6081 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-24 19:35:13 +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
a469c28c3c CustomStage Renaming Part 1 
Search and replace:
GrCustomStage->GrEffect
GrCustomStageTestFactory->GrEffectTestFactory

renamed the cpp/h files from customStage->effect

reordered gypi, #includes, forward decls to maintain alphabetical sort.

manually fixed up some whitespace and linewraps

deleted a commented out #include

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

git-svn-id: http://skia.googlecode.com/svn/trunk@6076 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-24 18:28:34 +00:00
skia.committer@gmail.com
989a95ea77 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5989 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-18 02:01:23 +00:00
bsalomon@google.com
67e78c9e47 Use GrCustomStage to implement color matrix. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6716044

git-svn-id: http://skia.googlecode.com/svn/trunk@5975 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-17 13:36:14 +00:00
bsalomon@google.com
288d9549b4 Separate out the texture matrix from the coord-system change matrix in GrSamplerState. This is a step towards moving texture matrix to GrCustomStage. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6721047

git-svn-id: http://skia.googlecode.com/svn/trunk@5973 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-17 12:53:54 +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
bsalomon@google.com
b022177777 Require matrix for custom stage to be set when custom stage is installed. 
Review URL: https://codereview.appspot.com/6696044

git-svn-id: http://skia.googlecode.com/svn/trunk@5962 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-16 14:16:11 +00:00
bsalomon@google.com
858804dfe6 Use AutoMatrix in GrTextContext 
Review URL: https://codereview.appspot.com/6691043

git-svn-id: http://skia.googlecode.com/svn/trunk@5952 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-15 14:25:50 +00:00
bsalomon@google.com
1e269b5a08 Spell correct some comments. 
Unreviewed



git-svn-id: http://skia.googlecode.com/svn/trunk@5951 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-15 14:25:31 +00:00
skia.committer@gmail.com
f57c01bdcf Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5943 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-13 02:01:56 +00:00
bsalomon@google.com
a99226eb8c Commit SkGpuDevice.h which was omitted from r5918 for some reason. 
git-svn-id: http://skia.googlecode.com/svn/trunk@5919 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-12 15:01:38 +00:00
bsalomon@google.com
3cbaa2d4da Beef up GrContext::AutoMatrix to handle doing GrPaint matrix adjustments. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6656047

git-svn-id: http://skia.googlecode.com/svn/trunk@5918 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-12 14:51:52 +00:00
bsalomon@google.com
3ab43d5c5b Minimize use of SkDraw's matrix in SkGpuDevice. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6604068

git-svn-id: http://skia.googlecode.com/svn/trunk@5906 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-11 19:39:09 +00:00
bsalomon@google.com
a6926b1f03 Reland r5861 but leave setMatrixClip virtual on SkDevice (IOW this is a partial revert of r5871 which reverted r5861). 
Unreviewed
Review URL: https://codereview.appspot.com/6631062

git-svn-id: http://skia.googlecode.com/svn/trunk@5881 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-10 15:25:50 +00:00
robertphillips@google.com
3fffb2ee9f Reverting r5861 (remove gainfocus and setMatixClip) due to Chrome compilation issues 
git-svn-id: http://skia.googlecode.com/svn/trunk@5871 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-09 22:30:18 +00:00
bsalomon@google.com
a1c3d78f22 Remove gainFocus() and setMatrixClip() virtuals from SkDevice. 
R=reed@google.com,robertphillips@google.com
Review URL: https://codereview.appspot.com/6636050

git-svn-id: http://skia.googlecode.com/svn/trunk@5861 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-09 14:20:37 +00:00
bsalomon@google.com
0e354aacd8 Remove external matrix feature. 
We haven't been testing this for nearly two years.

R=reed@google.com
Review URL: https://codereview.appspot.com/6640044

git-svn-id: http://skia.googlecode.com/svn/trunk@5857 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-08 20:44:25 +00:00
bsalomon@google.com
0f11e1ab5b Remove translate param from GrContext::drawPath (and subsequent calls). 
Review URL: https://codereview.appspot.com/6615062

git-svn-id: http://skia.googlecode.com/svn/trunk@5852 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-08 14:48:36 +00:00
bsalomon@google.com
c7448cef09 GrPaint encapsulation. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6624052

git-svn-id: http://skia.googlecode.com/svn/trunk@5838 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-05 19:04:13 +00:00
bsalomon@google.com
88becf450f Rename GrPaint fields/enums/members texture->color mask->coverage. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615046

git-svn-id: http://skia.googlecode.com/svn/trunk@5827 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-05 14:54:42 +00:00
bsalomon@google.com
af84e748ce Move setPaint from GrContext to GrDrawState. 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6624045

git-svn-id: http://skia.googlecode.com/svn/trunk@5823 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-05 13:23:24 +00:00
bsalomon@google.com
e6e62d1de9 Make numTextures() be non-virtual on GrCustomStage. 
R=tomhudson@google.com,robertphillips@google.com,senorblanco@chromium.org
Review URL: https://codereview.appspot.com/6586081

git-svn-id: http://skia.googlecode.com/svn/trunk@5805 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-04 14:38:48 +00:00
bsalomon@google.com
2b64f84b4b Add SkNativeGLContext implementation for iOS. 
R=caryclark@google.com
Review URL: https://codereview.appspot.com/6589055

git-svn-id: http://skia.googlecode.com/svn/trunk@5767 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 15:25:12 +00:00
skia.committer@gmail.com
dc3a4e5fa8 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5762 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-02 02:01:24 +00:00
robertphillips@google.com
ccb3950409 Speculative render target ref/unref fixes 
https://codereview.appspot.com/6592051/



git-svn-id: http://skia.googlecode.com/svn/trunk@5754 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 18:25:13 +00:00
reed@google.com
7ec0015ec3 delete obsolete/unused SkGpuCanvas 
git-svn-id: http://skia.googlecode.com/svn/trunk@5752 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-01 18:06:05 +00:00
skia.committer@gmail.com
22b460cef6 Sanitizing source files in Skia_Periodic_House_Keeping 
git-svn-id: http://skia.googlecode.com/svn/trunk@5735 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-29 02:01:02 +00:00
robertphillips@google.com
bac6b0575a Update Ganesh to support fractional rects in drawBitmapRect 
https://codereview.appspot.com/6561070/



git-svn-id: http://skia.googlecode.com/svn/trunk@5724 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-28 18:06:49 +00:00
reed@google.com
33535f3c48 Reimplement drawBitmapRectToRect to correctly handle fraction srcRect. 
The prev impl relied on drawBitmap "deducing" the destination rect by applying
the computed matrix to the bitmap's bounds. This cannot be done if the srcRect
is fractional, and therefore not representable w/ a bitmap.

The new impl computes the same matrix, but calls down to the device via drawRect
+ a bitmap_shader. This allows us to specfiy the dstRect explicitly.

The possible down-side is that we now rely on the device subclass to efficiently
handle draRect+shader, instead of calling its drawBitmap entry-point.

To give the device the chance to handle this differently, I now call through to
a new device virtual: drawBitmapRect. The default impl is to create the shader
and call drawRect, but a subclass can intercept that.

For now, the GPU override of drawBitmapRect is mimicing the old behavior (by
rounding the srcRect to an iRect). This preserves its ability to call drawBitmap
which handles very-large textures, but shows some gittering/imprecision, due to
the rounding. ... this is the same GPU behavior we have before this CL.
Review URL: https://codereview.appspot.com/6542065

git-svn-id: http://skia.googlecode.com/svn/trunk@5663 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-25 15:37:50 +00:00
robertphillips@google.com
cdb426d55a Fix for GrTextureStripAtlas memory leak 
https://codereview.appspot.com/6549050/



git-svn-id: http://skia.googlecode.com/svn/trunk@5648 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-24 19:33:59 +00:00
bsalomon@google.com
db545aec72 Fix GrTextureAccess::operator == 
compare the textures, correctly intepret memcmp result, don't compare last byte of swizzle array which must be 0.

BUG=895
Review URL: https://codereview.appspot.com/6542048

git-svn-id: http://skia.googlecode.com/svn/trunk@5605 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-20 15:37:30 +00:00
bsalomon@google.com
1ce49fc917 Move GrTextureParams from GrSamplerState to GrTextureAccess 
Review URL: https://codereview.appspot.com/6496135/



git-svn-id: http://skia.googlecode.com/svn/trunk@5582 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-18 14:14:49 +00:00
bsalomon@google.com
7534747e63 Add GrColor to RGBA float helper func 
Review URL: https://codereview.appspot.com/6518044/





git-svn-id: http://skia.googlecode.com/svn/trunk@5572 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-17 17:23:21 +00:00
borenet@google.com
dabdd9e71d Revert r5491, r5495, r5497, and r5498. 
Review URL: https://codereview.appspot.com/6499097

git-svn-id: http://skia.googlecode.com/svn/trunk@5501 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-09-11 20:39:09 +00:00