drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
218,863 Commits 1 Branch 0 Tags
Commit Graph

2320 Commits

Author SHA1 Message Date
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
John Reck
773bbe0357 Revert "Add ninePatch support to Canvas.h" 
This reverts commit edca320a2b42011f98c308fdf25fc0494c6a5454.

Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b
 2015-08-17 15:24:09 -07:00
John Reck
d2e7214179 Makefile re-jiggering 
Change-Id: I6a8d7c9ecbc4f1af8bc4a6e1409787f215d6fc5b
 2015-08-17 13:29:10 -07:00
Derek Sollenberger
deead00082 Merge "Add ninePatch support to Canvas.h" 2015-08-17 17:20:55 +00:00
Chris Craik
31710114ba Merge "Make the value for shadowRadius less than 1.0 work" 2015-08-17 16:37:36 +00:00
Derek Sollenberger
3c9edc9fae Merge "Cleanup unused param in RenderNode::computeOrdering" 2015-08-17 12:44:06 +00:00
huanhuan.x.wang
a46ca5ec73 Make the value for shadowRadius less than 1.0 work 
bug:22806069

Shadow effect is not visible if the shadowRadius is set
between 0.1 and 1.0.

Cherry-pick of 8d9b5fbd from AOSP

Change-Id: Ifff71f44d66ba604bd751bb1df96a9904ae7998e
 2015-08-14 22:47:47 +00:00
Chris Craik
e3f0a881c2 Merge "Make the value for shadowRadius less than 1.0 work" 2015-08-14 22:02:19 +00:00
John Reck
d6d6843aaa Remove unneeded main.cpp 
BUILD_NATIVE_TEST actually includes
a main, so this is potentially conflicting

Change-Id: Ic1e60ab3c005417e8aef3d3521409ea034616764
 2015-08-14 14:34:17 -07:00
Derek Sollenberger
f293259c0d Cleanup unused param in RenderNode::computeOrdering 
Change-Id: I4012ac7fce446770c5619dc149f6d62741237fc2
 2015-08-14 15:11:23 -04:00
Derek Sollenberger
edca320a2b Add ninePatch support to Canvas.h 
Change-Id: Ib3202fd7c5b9f35853f286abe84b3ed009df1a81
 2015-08-14 14:59:37 -04:00
John Reck
25f8da9b6a Merge "Support new EGL extensions" 2015-08-13 15:26:55 +00:00
Andreas Gampe
ea30eb29f8 Hwui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512

(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)

Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
 2015-08-12 18:05:35 -07:00
Andreas Gampe
fea85a33b7 Hwui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512

(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)

Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
 2015-08-12 16:30:32 -07:00
John Reck
149173d28c Support new EGL extensions 
Bug: 21753739

Includes a revert of 13d1b4ab10fbee5e81a2ba1ac59cfae1e51d3ef0
as that only supported EGL_EXT_buffer_age

Change-Id: Ia86a47d19e3355c067934d7764c330b640c6958d
 2015-08-12 14:26:05 -07:00
John Reck
c128823940 Fix bug in calculating perspective damage 
Change-Id: Iacab98cf3525f891012087acf85e4205b5e8f0d0
 2015-08-12 13:52:01 -07:00
Ben Wagner
60126efd7d Use unique_ptr instead of SkAutoTDelete. 
Skia would like to make SkAutoTDelete private, given that unique_ptr
now exists and is a better standard alternative.

Change-Id: Ie21bc4546c93e2096c1e43b26eb3ef80b8f11de4
 2015-08-07 17:54:35 -04:00
John Reck
17dafd6033 am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list" 
* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
  animateNoDamage failed to remove from current frame list
 2015-08-04 21:14:45 +00:00
John Reck
d56554e82b am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list" 
* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
  animateNoDamage failed to remove from current frame list
 2015-08-04 21:13:23 +00:00
John Reck
016e0091d6 am b47ea9b2: am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0" 
* commit 'b47ea9b2ed24f8eb6fc8b338555ff0d8825d8565':
  hwui: add extension to support unpack operations in OpenGL ES 2.0
 2015-08-04 21:00:09 +00:00
John Reck
0aee76c303 Merge "renderthread: add EGL_EXT_buffer_age support" 2015-08-04 20:54:20 +00:00
John Reck
666f319443 am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0" 
* commit '2fa3eec0e1807f6a45b71a41624698e8cc949026':
  hwui: add extension to support unpack operations in OpenGL ES 2.0
 2015-08-04 20:53:55 +00:00
John Reck
bc04d3acba Merge "animateNoDamage failed to remove from current frame list" 2015-08-04 20:52:40 +00:00
John Reck
b47ea9b2ed am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0" 
* commit '2fa3eec0e1807f6a45b71a41624698e8cc949026':
  hwui: add extension to support unpack operations in OpenGL ES 2.0
 2015-08-04 20:51:42 +00:00
John Reck
9acd09d364 am 598b0123: am 67716c13: am e28c5d62: am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev 
* commit '598b0123d322b396e8bfc3d66f228cf0b7485eac':
  Fix crash in kModeProcessNoContext
 2015-08-04 20:20:41 +00:00
Season Li
13d1b4ab10 renderthread: add EGL_EXT_buffer_age support 
EGL_EXT_buffer_age is better than EGL_BUFFER_PRESERVED
because it can save memory bandwidth used to blit
back buffer into front buffer.

Change-Id: I2fea0ee08dc7dd66e348b04dd694d075d509d01b
 2015-08-04 13:01:54 -07:00
John Reck
a975a84498 am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev 
* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
  Fix crash in kModeProcessNoContext
 2015-08-04 19:48:30 +00:00
John Reck
95cd24bb9d Fix crash in kModeProcessNoContext 
Bug: 22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
 2015-08-04 18:19:11 +00:00
Ben Wagner
a11ee3c413 Add Skia includes where needed. 
A proposed change in Skia will forward declare more classes in more
headers. As a result, some Skia headers need to be explicitly
included.

Change-Id: I577095afde9de0e36b8f904aee91979b01e30726
 2015-08-04 17:28:43 +00:00
Ye Ouyang
68eb3b22b0 animateNoDamage failed to remove from current frame list 
runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.

Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.

Allowing the animation to happen irrespective of animators solves the problem.

Change-Id: Ifa72286cdc6ff785fcc999f3b951dd787e7003e9
 2015-08-04 10:42:32 -05:00