Merge pull request #20 from mono/gpu-support
authorMatthew Leibowitz <mattleibow@live.com>
Fri, 2 Sep 2016 02:07:03 +0000 (04:07 +0200)
committerGitHub <noreply@github.com>
Fri, 2 Sep 2016 02:07:03 +0000 (04:07 +0200)
GPU Support for v54

1  2 
gyp/core.gypi
include/c/sk_canvas.h
include/c/sk_types.h
src/c/sk_canvas.cpp

diff --cc gyp/core.gypi
Simple merge
@@@ -328,11 -328,15 +328,18 @@@ SK_API bool sk_canvas_get_clip_bounds(s
  */
  SK_API bool sk_canvas_get_clip_device_bounds(sk_canvas_t* t, sk_irect_t* cbounds);
  
+ /**
+     Trigger the immediate execution of all pending draw operations. For the GPU
+     backend this will resolve all rendering to the GPU surface backing the
+     SkSurface that owns this canvas.
+ */
+ SK_API void sk_canvas_flush(sk_canvas_t* ccanvas);
  SK_API sk_canvas_t* sk_canvas_new_from_bitmap(const sk_bitmap_t* bitmap);
  
 +SK_API void sk_canvas_draw_bitmap_lattice(sk_canvas_t* t, const sk_bitmap_t* bitmap, const int* xDivs, int xCount, const int* yDivs, int yCount, const sk_rect_t* dst, const sk_paint_t* paint);
 +SK_API void sk_canvas_draw_image_lattice(sk_canvas_t* t, const sk_image_t* image, const int* xDivs, int xCount, const int* yDivs, int yCount, const sk_rect_t* dst, const sk_paint_t* paint);
 +
  SK_C_PLUS_PLUS_END_GUARD
  
  #endif
Simple merge
Simple merge