6985 Commits

Author SHA1 Message Date
Stefan Kuhne
fe1f99c2b2 Merge "MultiThreaded rendering of different renderNodes" 2015-09-21 22:08:30 +00:00
Chris Craik
6e6646c037 Unify extensions parsing behavior
Removes remnants of EGL extension support, and persistence of
GL extension list.

Change-Id: I35aec12d900bdb33549ea47654bb8146f350ef48
2015-09-21 13:14:20 -07:00
Skuhne
ea7a7fb75a MultiThreaded rendering of different renderNodes
This is adding the renderer side infrastructure to allow
rendering multiple render nodes with different threads.
This is a pre-step for decoupling a non client decor
resize reder from a content resize render.

Multiple render nodes can be added to be drawn, and to
prevent overdrawing, a content bounds area can be set

Bug: 22527834

Change-Id: Ie7271e20895bf38957e5a84aeefc883e282039ad
2015-09-21 07:18:00 -07:00
Chris Craik
0e35962e6d Merge "Move texture upload behavior to TextureState" 2015-09-14 19:46:13 +00:00
Chris Craik
68f5b8a781 Move texture upload behavior to TextureState
Change-Id: If1cb32bbc04f437fa0d079084de832de9fd777c2
2015-09-09 14:11:03 -07:00
Chris Craik
75e38f4e75 Merge "CanvasState frame init refactor" 2015-09-09 20:51:41 +00:00
Tao Bai
ab5bca1519 Merge "Load app resource as shared library." 2015-09-09 16:08:12 +00:00
Tao Bai
a6d7e3fb9c Load app resource as shared library.
- Added aapt command line flag --app-as-shared-lib to build app resources
  that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
  app resource as shared library.

Bug 22487604

Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
2015-09-08 18:48:42 -07:00
Chris Craik
524a5af063 Merge "Fix pointer math in page start calculation" 2015-09-02 23:35:25 +00:00
Chris Craik
25c8d5b1c2 Fix pointer math in page start calculation
Change-Id: I1582e52f358fece647e35b13e93e56fd96b9a227
2015-09-02 16:20:56 -07:00
Chris Craik
64e445bf74 CanvasState frame init refactor
bug:23760482

Change-Id: Idc0802b4b8a6a3cebd20797350f4eb01bcc3fe77
2015-09-02 15:15:56 -07:00
Chris Craik
9557106c6f Add CanvasState tests
Change-Id: Idcd022f6e4015e074d8e73b4c116e0788fd4f045
2015-09-02 12:55:52 -07:00
Dan Willemsen
a3e05c4ccb am 83533a23: am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
* commit '83533a235c64a3b3cbecf152b678585f1e6b3577':
  Remove USE_MINGW, whitelist windows modules
2015-09-01 17:05:59 +00:00
Dan Willemsen
83533a235c am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
* commit '13786e281e4d67b9e2ff549fee34ddb3e82e0325':
  Remove USE_MINGW, whitelist windows modules
2015-09-01 16:51:05 +00:00
Dan Willemsen
13786e281e am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
* commit '60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
  Remove USE_MINGW, whitelist windows modules
2015-09-01 16:37:10 +00:00
Dan Willemsen
4aa679ff96 Remove USE_MINGW, whitelist windows modules
Bug: 23566667
Change-Id: Ie6b8c51e2b6d6273f99f4e361c440136d7c6915c
2015-08-28 15:28:26 -07:00
John Reck
e248bd1b2c Serializing display lists
This is a WIP prototype

Change-Id: Id4bfcf2b7bf905221c3734b7b6887c9b2efd37e6
2015-08-26 16:29:15 -07:00
Chris Craik
8adc30a805 Merge "Add static asserts around assumed-static skia enum values" 2015-08-21 23:09:24 +00:00
Chris Craik
71c10ee8be Merge "Switch several enums to enum classes" 2015-08-21 23:08:39 +00:00
Chris Craik
b9ce116dac Switch several enums to enum classes
Change-Id: I00ecd0b61657196b51704f70ca31a9d1c1ac254e
2015-08-21 23:05:44 +00:00
Chris Craik
216048ffb0 Add static asserts around assumed-static skia enum values
Protects assumptions around enums value built into LUTs

Change-Id: Ica0692e4309d50b4d3897e0f3f47809d14f786fe
2015-08-21 15:32:58 -07:00
Chris Craik
3aadd60521 Revert "Revert "Simplify TextureView draw path""
Fixed build breakage

This reverts commit d35dcb13115ca1dd8c07e397f43a186cd7fd1a01.

Change-Id: Id3a103fbaac15a05f558bce2161ce17b6e8d2ea3
2015-08-21 10:33:02 -07:00
Chris Craik
2f967f3e41 Merge "Remove return values from clipping operations" 2015-08-21 16:50:22 +00:00
Chris Craik
4d3e704b04 Remove return values from clipping operations
bug:22530947

Also switch mode to enum class

Change-Id: Iabb38634c01f2e3203b1b715967d8828d95da190
2015-08-20 15:00:11 -07:00
Derek Sollenberger
6e03543f63 Add transitive dependency to enable refactoring within Skia
Change-Id: Iaf9841a2f74f927bb7aac6bbc9fc3cdfe0312fd5
2015-08-20 16:12:01 -04:00
Chris Craik
1858541add Merge "Define GLSL version" 2015-08-20 19:58:08 +00:00
Ben Wagner
b03198de9f Merge "Use static_assert instead of SK_COMPILE_ASSERT." 2015-08-20 14:56:10 +00:00
Bart Sears
3b1c32eb5d Merge "Revert "Simplify TextureView draw path"" 2015-08-20 02:25:30 +00:00
Bart Sears
d35dcb1311 Revert "Simplify TextureView draw path"
This reverts commit 20a248934c67b19c8734362dba76a5cc94254686.

Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
2015-08-20 02:23:39 +00:00
Chris Craik
87f9c42f54 Merge "Simplify TextureView draw path" 2015-08-20 00:02:09 +00:00
Chris Craik
20a248934c Simplify TextureView draw path
bug:20461288

Change-Id: I239fbd26ab2177481c84feb62a1da68faeb634ac
2015-08-19 16:59:45 -07:00
Chris Craik
f2dc936a90 Merge "Remove MathUtils::min/max" 2015-08-19 23:09:54 +00:00
Chris Craik
9db58c031f Remove MathUtils::min/max
bug:22202895

Change-Id: Ia115d86871314e3819f684ea7307356aed13a28e
2015-08-19 15:53:01 -07:00
Chris Craik
e5e6f4837b Merge "Change setMatrix behavior to only affect canvas-local matrix" 2015-08-19 22:38:07 +00:00
Chris Craik
8bd68c6b7d Define GLSL version
bug:21923805

Change-Id: Ie44fb9cf38ef5f19df957e4a639d9c7d47da391e
2015-08-19 15:29:45 -07:00
Chris Craik
7c85c54499 Remove Matrix4::load(Matrix4&)
bug:22320446

Change-Id: Id6d1cc9b4aea828b0cdf622ad672064d72671f8d
2015-08-19 15:10:25 -07:00
Ben Wagner
e3a40ea488 Use static_assert instead of SK_COMPILE_ASSERT.
Now that static_assert is allowed, there is no need to use a non-
standard compile time assertion.

Change-Id: I0b294efcf494983f8241e9d5a2c476e2f2a9fff0
2015-08-19 17:21:17 -04:00
Chris Craik
6daa13c5fa Change setMatrix behavior to only affect canvas-local matrix
bug:22189925

This makes setMatrix(getMatrix()) work as expected, and makes setMatrix()
much more useful without changing behavior relative to a View's parent
hierarchy.

Change-Id: I608613bd27c1b9052ae583f8fd2119cf37a2f6d7
2015-08-19 13:32:15 -07:00
Ben Wagner
283e907af4 Merge "Use 'new' instead of 'SkNEW'." 2015-08-19 19:01:04 +00:00
Derek Sollenberger
45f250aa1f Remove accidentally added old makefile
Change-Id: Id3966f1458c14b659b1b35437e6620fb8306aa83
2015-08-19 13:56:08 -04:00
Ben Wagner
d1cbc16089 Use 'new' instead of 'SkNEW'.
There isn't any good reason for Android code to be using SkNEW,
and in some places it is potentially an issue. Also, SkNEW really
should be considered private to Skia at this point.

Change-Id: I35c675bd2c45b7a65c526508c202a30e30859491
2015-08-19 13:04:36 -04:00
Ben Wagner
c091e218af Merge "Remove use of SkAutoSTMalloc from Android." 2015-08-19 15:38:14 +00:00
Ben Wagner
6bbf68d05a Remove use of SkAutoSTMalloc from Android.
Skia desires to make SkTemplates.h private since the classes there
are designed only for internal use.

Change-Id: I1e05e54de9eb68e50ccd6a691889fecf34bc9cea
2015-08-19 11:26:06 -04:00
Derek Sollenberger
55f4445013 Merge "Add ninePatch support to Canvas.h" 2015-08-19 13:10:40 +00:00
Chris Craik
93481f08b0 am 7da9d7fa: am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '7da9d7fae673473a3a24d3ff0127bd0c67f70337':
  Constrain drawBitmap matrix-to-rect optimization
2015-08-19 02:22:33 +00:00
Chris Craik
7da9d7fae6 am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '9c45aa8f0db8e3c5370172018e162b7ecaf9ea4a':
  Constrain drawBitmap matrix-to-rect optimization
2015-08-19 01:43:41 +00:00
Chris Craik
fc7f6197cb am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
  Constrain drawBitmap matrix-to-rect optimization
2015-08-19 01:41:25 +00:00
Chris Craik
892768fb3e am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
  Constrain drawBitmap matrix-to-rect optimization
2015-08-19 00:54:00 +00:00
Chris Craik
e688bf7203 Constrain drawBitmap matrix-to-rect optimization
bug:22962165

Optimization is not valid if matrix would flip image.

Change-Id: Ieee42390517bd3466b7d94596f0fbbe192ab757e
2015-08-18 14:53:47 -07:00
Derek Sollenberger
4c5efe9290 Add ninePatch support to Canvas.h
Change-Id: Ic095291fe55911c6501c1bdefa4b8da973c77319
2015-08-18 15:32:57 -04:00