diff options
| author |  jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-09 21:04:52 +0000 |
|---|---|---|
| committer | jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-09 21:04:52 +0000 |
| commit | 74dda9018e8bdd650698e763404f19144c6d0a42 (patch) | |
| tree | 7cfb70a1e2cbbac3e61d10848dfc1f77b93c37e0 /gyp | |
| parent | a543b604e425c00ca7957160e73220ca71f75e0b (diff) | |
This takes the convex path tesselator from the Android code and hooks it into a
GrPathRenderer. GrAndroidPathRenderer is activated by gyp flag 'skia_android_path_rendering'.
A few changes to get this to work:
- Had to change SkPaint* param to SkStrokeRec& in ConvexPathVertices()
- Had to copy the vertex buffer created by the Android code to GrDrawTarget-generated vertex buffer, and convert float alpha to GrColor for AA paths
git-svn-id: http://skia.googlecode.com/svn/trunk@7110 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_variables.gypi | 2 | ||||
| -rw-r--r-- | gyp/experimental.gyp | 2 | ||||
| -rw-r--r-- | gyp/gpu.gyp | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index fc2b3a93f4..5aca19c23b 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -82,6 +82,7 @@ 'skia_mesa%': 0, 'skia_nv_path_rendering%': 0, 'skia_stroke_path_rendering%': 0, + 'skia_android_path_rendering%': 0, 'skia_texture_cache_mb_limit%': 0, 'skia_angle%': 0, 'skia_directwrite%': 0, @@ -103,6 +104,7 @@ 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', + 'skia_android_path_rendering%': '<(skia_android_path_rendering)', 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', 'skia_angle%': '<(skia_angle)', 'skia_arch_width%': '<(skia_arch_width)', diff --git a/gyp/experimental.gyp b/gyp/experimental.gyp index 09d5944b52..09711ac400 100644 --- a/gyp/experimental.gyp +++ b/gyp/experimental.gyp @@ -6,13 +6,11 @@ 'include_dirs': [ '../include/config', '../include/core', - '../experimental/AndroidPathRenderer', ], 'sources': [ '../experimental/SkSetPoly3To3.cpp', '../experimental/SkSetPoly3To3_A.cpp', '../experimental/SkSetPoly3To3_D.cpp', - '../experimental/AndroidPathRenderer/AndroidPathRenderer.cpp', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 474bdc146a..7438babe59 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -214,6 +214,18 @@ 'GR_STROKE_PATH_RENDERING=1', ], }], + [ 'skia_android_path_rendering', { + 'sources': [ + '../experimental/AndroidPathRenderer/GrAndroidPathRenderer.cpp', + '../experimental/AndroidPathRenderer/GrAndroidPathRenderer.h', + '../experimental/AndroidPathRenderer/AndroidPathRenderer.cpp', + '../experimental/AndroidPathRenderer/AndroidPathRenderer.h', + '../experimental/AndroidPathRenderer/Vertex.h', + ], + 'defines': [ + 'GR_ANDROID_PATH_RENDERING=1', + ], + }], [ 'skia_os == "linux"', { 'sources!': [ '../src/gpu/gl/GrGLDefaultInterface_none.cpp', |