3500 Commits

Author SHA1 Message Date
Martijn Coenen
7b4d850187 Fix call to deprecated range_x().
Test: master builds again.
Change-Id: I0fa7627c7ec28317dd7e37cca93d2b2c90e6d1ea
2016-11-16 11:33:37 +01:00
Martijn Coenen
bbec302fcf Merge "Fix deprecated range_x calls." am: 87cafe8f33 am: d03b17c29a am: 6e2c276c78
am: f4a0f12eb7

Change-Id: Ifdec08542102cf4eba2aa9baf206272523b56894
2016-11-16 10:30:15 +00:00
Martijn Coenen
6e2c276c78 Merge "Fix deprecated range_x calls." am: 87cafe8f33
am: d03b17c29a

Change-Id: I70280eb85b9430c23f6b2681375cbcfa9da2dd38
2016-11-16 10:07:54 +00:00
Martijn Coenen
d03b17c29a Merge "Fix deprecated range_x calls."
am: 87cafe8f33

Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d
2016-11-16 10:00:23 +00:00
Seigo Nonaka
9669487d00 Merge "Move test only initialization to each test setup." 2016-11-16 02:17:57 +00:00
Martijn Coenen
90213f341d Fix deprecated range_x calls.
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
2016-11-15 09:07:12 +01:00
TreeHugger Robot
199ab1f175 Merge "Use layered version of graphic buffer allocation calls." 2016-11-15 05:15:04 +00:00
Seigo Nonaka
b6e2013975 Move test only initialization to each test setup.
Global default typeface initialization is only used by test code.
It is good to do in test and remove from production.

Test: ran hwuimicro hwui_unit_tests hwuimacro
Change-Id: I7090b1794828072112540b4e357a6d24bf8f664a
2016-11-15 10:45:01 +09:00
Derek Sollenberger
af9dc4dc30 Merge "Handle vulkan windowing directly in SkiaVulkanPipeline" 2016-11-14 13:26:05 +00:00
John Reck
0b5c643044 Fix unit tests
This is a partial revert of e2179925df2ce174d81dd6f7abae626cc859ce00
with the TODO comment replaced with why this can happen.

Test: Ran hwui's unit tests
Change-Id: I0d35eef773a401585bb8e75415da66de5aeb27d1
2016-11-11 14:09:09 -08:00
Craig Donner
850054cb46 Use layered version of graphic buffer allocation calls.
Allocators now require a layer count, but in these cases we can
assume that a single layer is sufficient, since that's what they
effectively do now.

Bug: 31686534
Test: manual
Change-Id: I30e498f8cb3e27c497f7bab9fbf2e7b4dad842d5
2016-11-11 11:35:04 -08:00
Derek Sollenberger
e547dd0b80 Cleanup asserts and remove usage of deprecated data structure.
Test: compile only
Change-Id: I9e9f1a3fb37db043d76a98a9568679e7e531e283
2016-11-09 18:04:44 +00:00
Derek Sollenberger
0e3cba3146 Handle vulkan windowing directly in SkiaVulkanPipeline
Test: manual testing in skiavk mode
Change-Id: I2fab80bae2787bfdacbc70d0402e98450e59406d
2016-11-09 11:58:36 -05:00
TreeHugger Robot
e3d281ea18 Merge "Add debug memory tracking to SkiaGLPipeline" 2016-11-08 01:15:33 +00:00
Matt Sarett
4bda6bfaa6 Add debug memory tracking to SkiaGLPipeline
Test: Sample output is below

D/OpenGLRenderer: Resource Cache Usage:
D/OpenGLRenderer:       32 items out of 8192 maximum items
D/OpenGLRenderer:  4635572 bytes (4.42 MB) out of 96.00 MB maximum

This is less verbose than OpenGL memory debug output for
two reasons:
(1) SkiaGL has less caches.
(2) SkiaGL does not support printing on cache additions/evictions.
    This seems like more of an internal debugging tool rather than
    a user-facing debug feature.  I think it's best to leave this
    unimplemented until we find that it might be useful.

BUG:32370375

Change-Id: Ib063f1c2a7f88e9840341b1001d227f556d88f26
2016-11-07 16:35:06 -05:00
TreeHugger Robot
9310f59cac Merge "Fix bug with displaying visual profile bars" 2016-11-07 21:32:28 +00:00
Derek Sollenberger
3e62009709 Merge "Refactor pin/unpinImages to work across pipelines." 2016-11-07 20:59:48 +00:00
Derek Sollenberger
1dc5fba2dc Merge "Enable SkiaPipelines to interoperate with existing GlesDriver configs." 2016-11-07 20:42:38 +00:00
Matt Sarett
4c9bbf4eef Fix bug with displaying visual profile bars
Test: Used debugging feature.

BUG:32370375

Change-Id: I56e4e2155566a219ce43882e48b327123edccfe2
2016-11-07 14:23:33 -05:00
Derek Sollenberger
7e044fef62 Enable SkiaPipelines to interoperate with existing GlesDriver configs.
Test: hwui unit tests
Change-Id: Icd94d0e21130d86fb5514801f999d0018a69e151
2016-11-07 10:59:20 -05:00
Derek Sollenberger
b7d34b64dd Refactor pin/unpinImages to work across pipelines.
Test: existing CTS tests still pass
Change-Id: Ib2607e9853396bad42f298829b5c5da0d210af32
2016-11-07 10:05:56 -05:00
Seigo Nonaka
4b56177429 Merge "Make sure the Typeface is loaded before calling measureText." 2016-11-07 05:22:52 +00:00
John Reck
b365b0db93 Merge "Re-unite sources with their headers" am: e43444a00b
am: 946d11d216

Change-Id: Ib9fac5fff2f2ce90eebc2c6eb5208de33ea28723
2016-11-04 21:52:43 +00:00
John Reck
946d11d216 Merge "Re-unite sources with their headers"
am: e43444a00b

Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
2016-11-04 21:47:34 +00:00
John Reck
03b5d506bc Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
2016-11-04 13:27:37 -07:00
John Reck
437d4e0daf Merge "Re-unite sources with their headers" 2016-11-04 19:32:06 +00:00
TreeHugger Robot
3d36fac235 Merge "Add SkiaProfileRenderer to draw visual debugging info" 2016-11-04 12:53:40 +00:00
Matt Sarett
cf2c05c652 Add SkiaProfileRenderer to draw visual debugging info
This adds support for debug.hwui.profile and
debug.hwui.show_dirty_regions to the Skia pipelines.

There still may be some follow up work for profiling
with visual bars.  The speed at which the renderer
is able to draw the rects in the graph is having a
noticeable effect on the actual data in the graphs.

Test: Verified that the features work as expected.

BUG:32370375

Change-Id: I24430da2bab3eb54f6a771f9c984f8ae0008a5a7
2016-11-03 21:42:58 -04:00
John Reck
f6113af2d6 Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
2016-11-03 16:26:59 -07:00
TreeHugger Robot
eea591b08e Merge "Fix RenderNodeDrawable to draw nonzero Z nodes when needed" 2016-11-03 22:30:11 +00:00
TreeHugger Robot
18da04ed2c Merge "Implement onDrawTextBlob in the SkiaCanvasProxy." 2016-11-03 20:04:18 +00:00
TreeHugger Robot
40800725d2 Merge "Implement Skia pipelines for OpenGL and Vulkan." 2016-11-03 19:59:46 +00:00
TreeHugger Robot
1106b82ea1 Merge "Reference ctable when adopting pointer in Bitmap" 2016-11-03 19:43:33 +00:00
TreeHugger Robot
c96468b062 Merge "update callers to newer Skia APIs" 2016-11-03 19:27:47 +00:00
Stan Iliev
2f06e8ad1a Fix RenderNodeDrawable to draw nonzero Z nodes when needed
Fix RenderNodeDrawable to draw nonzero Z nodes if not in a reordering
section.
Write an unit test modeled after FrameBuilder zReorder, which
verifies the bug fix.

Test: built and run unit tests on angler-eng.
bug: 32541103
Change-Id: Ifbf2d51f4432f5de3af4abe5987c2a72fed14185
2016-11-03 13:44:41 -04:00
Derek Sollenberger
09bd6c201d Implement onDrawTextBlob in the SkiaCanvasProxy.
Test: hwui_unit_tests now pass
Bug: 30353290
Change-Id: I26c98be394e9dbd1cf63fe3eac18cb090403ace7
2016-11-03 17:41:44 +00:00
Stan Iliev
500a0c30d4 Implement Skia pipelines for OpenGL and Vulkan.
Implement Skia pipelines for OpenGL and Vulkan:
base SkiaPipeline, SkiaOpenGLPipeline and SkiaVulkanPipeline.
Write unit tests for SkiaPipeline.

Test: Built and run manually on angler-eng.
Change-Id: Ie02583426cb3547541ad9bf91700602a6163ff58
2016-11-03 13:28:49 -04:00
John Reck
f0503b0b6f Merge "Add benchmarks for View inflation" 2016-11-03 17:14:57 +00:00
sergeyv
003f142562 Reference ctable when adopting pointer in Bitmap
Change-Id: I56aea10928f0ec73756ed055488a3e3516a9096e
Test: manual.
bug:32621254, 32561595
2016-11-03 10:04:28 -07:00
Mike Reed
ab12c1fe73 update callers to newer Skia APIs
Test: refactoring CL. Existing unit tests still pass.

Change-Id: I47e73e00f14f78dd9d4c48a142ac9853e7e4cad7
2016-11-03 12:58:42 -04:00
John Reck
3acf0382da Add benchmarks for View inflation
Also speed up RenderNode creation:

Use finalizer() instead of NativeAllocationRegistry, this
shaves ~3us off of creation currently

Avoid instanceof, instead have SurfaceView explicitly ask
for updates.

Remove unused method call.

Test: ran benchmarks
Change-Id: I3117fdf72313a4e6a9965baca9f2a8b855c19b34
2016-11-02 14:49:51 -07:00
Ben Wagner
52d5a55614 Merge "Replace SkAutoTUnref with sk_sp." 2016-11-02 20:32:02 +00:00
Ben Wagner
18bd88534a Replace SkAutoTUnref with sk_sp.
Skia would like to remove SkAutoTUnref and replace it with sk_sp.
This also removes the last SkAutoTDelete straggler.

Change-Id: Idd46fcbbffe7fc1edb243b82b1c2f5425ccd60b6
2016-11-02 16:30:50 +00:00
Derek Sollenberger
f87da67df9 Adding changes required by the master-skia merge.
Test: compile only
Change-Id: I39637a20da439edbf2831952df9bfa12da78e9b9
2016-11-02 11:37:13 -04:00
Mike Reed
c2f31df8b3 use SkBlendMode
skbug.com/5814

Test: compile only
Change-Id: Ibbaff43df1117b2ca77fd8f917f03d88cc476330
(cherry picked from commit 26edbcba8a2ed4cb300e7f87e679e3b73cec2772)
2016-11-02 11:36:48 -04:00
Sergei Vasilinetc
97cc85fd4b Merge "Routine to upload hardware bitmaps" 2016-11-01 19:32:19 +00:00
sergeyv
694d499662 Routine to upload hardware bitmaps
Change-Id: Id8283a0975325e6830d55fd1e33c5f292a1e9be0
Test: refactoring cl.
bug:30999911
2016-10-31 16:11:21 -07:00
Stan Iliev
021693b967 Implement SkiaRecordingCanvas, RenderNodeDrawable and other drawables.
Implement SkiaRecordingCanvas, RenderNodeDrawable, GLFunctorDrawable,
LayerDrawable, StartReorderBarrierDrawable, EndReorderBarrierDrawable.
Move AnimatedRoundRect and AnimatedCircle in a separate file.
All Skia pipeline files are moved in hwui/pipeline/skia folder.
Add unit tests for RenderNodeDrawable, StartReorderBarrierDrawable,
EndReorderBarrierDrawable and SkiaRecordingCanvas.

Test: I tested manually on 6P devices and did run the unit tests.
Change-Id: If2a347bd1fc4689953822294ce5bf98c7f3f57c7
2016-10-31 14:27:02 -04:00
Derek Sollenberger
96f4410a57 Merge "Refactor mock Functors into a common TestUtils class." 2016-10-28 20:17:56 +00:00
Derek Sollenberger
835b3a69c3 Refactor mock Functors into a common TestUtils class.
Test: refactor. existing tests still pass
Change-Id: I55258487c371869a5b91dd2dcf6bf7bd47ac1a35
2016-10-28 13:58:09 -04:00