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

2037 Commits

Author SHA1 Message Date
Chris Craik
c467adac42 Merge "Simplify Texture member initialization" 2015-02-23 22:39:46 +00:00
Chris Craik
8e93a7c937 Simplify Texture member initialization 
Change-Id: Iaaa6dd20e64a0a075d732b101e3c4278cad44047
 2015-02-23 13:21:53 -08:00
ztenghui
06518aa8de Merge "Correctly name the lightRadius" 2015-02-20 22:56:55 +00:00
John Reck
2517bc6dad Merge "C++11 style fixups" 2015-02-20 20:41:00 +00:00
Chris Craik
e1a0858fb0 Merge "Glop layer mesh rendering" 2015-02-20 19:30:40 +00:00
John Reck
c87be99c6e C++11 style fixups 
Change-Id: I356d02338820bfef41a9e278c88dafc17cfe1cf9
 2015-02-20 10:58:48 -08:00
ztenghui
62aa44c5ee Correctly name the lightRadius 
b/18282208

Change-Id: I5b6edcb37b710464c6ff0f5c05583bb7da720ff3
 2015-02-20 10:53:40 -08:00
John Reck
df570c6e66 Merge "Initial attempt at jank-tracking stat collection" 2015-02-20 16:28:30 +00:00
John Reck
ba6adf66d3 Initial attempt at jank-tracking stat collection 
Is a bit naive, perhaps overly aggressive, but sorta works

Change-Id: I01a774e00dbe681439c02557d9728ae43c45ce50
 2015-02-20 08:27:38 -08:00
Tom Hudson
806a6f07a3 Fix onDrawText for non-absolute positioning 
If we were drawing text with drawTextAbsolutePos() false, we would
draw the first character at 0,0 but subsequent characters would get
improperly offset by y. (or x if vertical text)

Change-Id: I4e76cd9d95bf1bb6ac021d99ef7cdd6333a290ba
 2015-02-20 13:08:47 +00:00
Chris Craik
f27133df2d Glop layer mesh rendering 
Change-Id: I2d902819d5d77f496b67d4d25a298782903e410d
 2015-02-19 18:06:05 -08:00
Chris Craik
fbf255125b Merge "Glop text shadows, clearLayerRegions, and rectangleList" 2015-02-18 18:56:03 +00:00
Chris Craik
36a35e366a Fix layer shader to store layer pointer 
bug:19419672

Change-Id: I4277348ceab41fbf45a107a8b21f64e2b4af23e0
 2015-02-18 17:47:21 +00:00
Chris Craik
2bb8f5606d Glop text shadows, clearLayerRegions, and rectangleList 
Change-Id: I83b36d1ee5d8f05f41acf244639019f9b8da79cd
 2015-02-17 17:46:39 -08:00
Chris Craik
922d3a7f6f Glop SkiaShader support 
Change-Id: I894a0b62701bd02367ab970813e4c332147351a2
 2015-02-17 15:45:46 -08:00
Chris Craik
30036092b4 Glop path texture support 
Change-Id: I505eb05991ca4c9b2e01e49988b8f962fad51462
 2015-02-12 16:16:57 -08:00
Chris Craik
0519c810a5 Glop Bitmap and RoundRect clipping support 
Change-Id: I4577546a5d2e5f084cc03f39a89db9231b8111ee
 2015-02-12 12:30:59 -08:00
Chris Craik
08fa43fdeb Fix Glop vertex alpha blending 
Need to force blending if vertices have alpha attribute

Change-Id: I821792db6b613b4d0243cf9c7a045cba014acdc1
 2015-02-09 19:08:02 -08:00
Chris Craik
2ab95d780b Glop support for indexed quads 
bug:19014311
Change-Id: If35a873421b41cc4508b0d8ac1b4d900c9bb3717
 2015-02-09 11:04:31 -08:00
Chris Craik
f7ccbfbd98 Merge "Glop ColorFilter & VertexBuffer support, initial enable" 2015-02-06 23:06:44 +00:00
Chris Craik
117bdbcfa3 Glop ColorFilter & VertexBuffer support, initial enable 
Enables Glop rendering for supported Rects and VertexBuffers
Also removes unused Query object

Change-Id: Ibe227bc362685a153159f75077664f0947764e06
 2015-02-06 13:42:25 -08:00
Chris Craik
785406c6b9 Merge "Don't try to fully tear down program in terminate()" 2015-02-05 18:02:19 +00:00
Chris Craik
3472568774 Don't try to fully tear down program in terminate() 
bug:19277550

The program will be destroyed anyway by nature of the program cache cleanup.

Change-Id: I304becd34fdf40baf314bae8b37d2c072ad44409
 2015-02-05 09:27:23 -08:00
Chris Craik
ecad24b49d Merge "GlopBuilder, and test app refactor" 2015-02-05 00:25:04 +00:00
Chris Craik
031888744e GlopBuilder, and test app refactor 
Change-Id: I2cd299ccf178007fd5f83bab6c3448f03aec7843
 2015-02-04 15:57:59 -08:00
John Reck
3f5175fccd resolved conflicts for merge of c7e6b93a to master 
Change-Id: I4b791f37193727a0306214645f2f98cdf218cad0
 2015-02-04 14:47:23 -08:00
John Reck
c7e6b93aba am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4 
* commit 'af6eaf656ec0de5fcbea03968daffe2c845e2089':
  Fix ANR caused by hwuiTask thread
 2015-02-04 22:08:27 +00:00
John Reck
5ad36d4591 Merge "Fix ANR caused by hwuiTask thread" 2015-02-04 21:53:48 +00:00
Chris Craik
9dfd7bd520 Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path" 2015-02-03 00:00:58 +00:00
Chris Craik
6c15ffa196 Refactoring of Program ownership/lifecycle, and WIP Glop rendering path 
Change-Id: I2549032790bddbc048b0bccc224ed8f386b4517c
 2015-02-02 14:08:57 -08:00
John Reck
8a6b56651b Merge "Add a WAIT_FOR_GPU_COMPLETION option" 2015-01-30 23:12:43 +00:00
John Reck
5515637540 Add a WAIT_FOR_GPU_COMPLETION option 
Change-Id: I18d526120651676109200bfd5da87cafcd7e3d13
 2015-01-30 12:46:09 -08:00
Chris Craik
d7328ae790 Merge "Refactor blending and texture gl state" 2015-01-30 18:53:01 +00:00
Chris Craik
44eb2c0086 Refactor blending and texture gl state 
Change-Id: Ia6b3c8b2afd3dfcee7f3ce401d846b789612054a
 2015-01-30 10:49:05 -08:00
Derek Sollenberger
8bc2d056e1 Merge "Create proxy between Skia's SkCanvas and the framework Canvas." 2015-01-30 18:23:01 +00:00
Chris Craik
de11d28710 Merge "Fix double create of Caches" 2015-01-30 18:15:07 +00:00
Derek Sollenberger
1db141f93c Create proxy between Skia's SkCanvas and the framework Canvas. 
This enables Picture.java to be replayed into HWUI in addition
to extending the Skia testing suite to HWUI.

Bug: 19011232
Change-Id: Id27ac03eec817b0784763e62ab8413a07b3b8cb2
 2015-01-30 12:56:37 -05:00
Chris Craik
ff5c8e8097 Fix double create of Caches 
bug:19208182
Change-Id: I91ac591cecc207da1b102013ca4985dd075cca80
 2015-01-30 09:46:18 -08:00
Derek Sollenberger
c4e4eef64a Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas" 2015-01-30 14:25:24 +00:00
John Reck
49bc4acfad resolved conflicts for merge of fe5ac4fc to master 
Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b
 2015-01-29 12:53:38 -08:00
John Reck
fe5ac4fc31 am 5f3e21ce: am 6efc3ac6: Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev 
* commit '5f3e21cebeecf042e8e18a5021b3965415d9ff60':
  Allow ~Layer() to happen after onGLContextDestroyed
 2015-01-29 20:28:08 +00:00
John Reck
57998017ff Allow ~Layer() to happen after onGLContextDestroyed 
Bug: 19146354
Change-Id: I9e885936168bd541bfbed4064ad67ab524f58e32
 2015-01-29 10:17:57 -08:00
Derek Sollenberger
b3d50e0075 Rename Canvas::getSkCanvas to Canvas::asSkCanvas 
Change-Id: I967a45698d382e54eaa5ff64fa8909ff00908650
 2015-01-29 11:25:55 -05:00
Chris Craik
96a5c4c7ba Move more GL state management to RenderState and its directory 
Change-Id: Ic68584e1c08dc64be2ad43450cb6caa1de834fdc
 2015-01-28 16:32:39 -08:00
Chris Craik
65fe5eeb19 Move scissor state to RenderState 
Change-Id: I1227a3886fb24e4d9fad79fca469794f06cfb15e
 2015-01-27 17:12:39 -08:00
Yabin Cui
026111bc56 am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS." 
automerge: 3a10a67

* commit '3a10a672f05735be46256617b8a61cdb1e589008':
  kill HAVE_PTHREADS.
 2015-01-27 23:27:37 +00:00
Yabin Cui
3a10a672f0 am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS." 
* commit 'f70492898b3efa3c5f480f195062fa6f293bc764':
  kill HAVE_PTHREADS.
 2015-01-27 07:04:55 +00:00
Yabin Cui
1610486d37 kill HAVE_PTHREADS. 
Bug: 19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
 2015-01-26 22:32:38 -08:00
Rob Tsuk
b9307823dd Merge "Ensure compatible layout for vertices" 2015-01-22 22:04:56 +00:00
Rob Tsuk
a9fc9b20da Ensure compatible layout for vertices 
Require that these structs have standard layout, which is what we need
to pass them to OpenGL. Inheritence with data members violates the
rules for standard layout so I re-implemented them using templates to
share the code and putting all the data members in each struct.

Change-Id: I19cd0e5518728f2d3e0993b17d15fce7be7e0edb
 2015-01-22 13:53:42 -08:00