6528 Commits

Author SHA1 Message Date
Chris Craik
26bf34200e Glop TextureLayer support
Change-Id: I348a926bd4a2f47be9fdbe74058c0aa2f8dc6276
2015-02-27 10:50:12 -08:00
Chris Craik
b11be294b1 Merge "Glop mesh reorg, support for drawBitmapMesh" 2015-02-26 19:04:42 +00:00
Chris Craik
ef2507439c Glop mesh reorg, support for drawBitmapMesh
Change-Id: Iaf5550bdd93da93e59a5b838234ab5612e067387
2015-02-26 10:56:07 -08:00
Chris Craik
ddd30928a7 Merge "Remove renderer abstract class" 2015-02-26 00:08:12 +00:00
Chris Craik
1a83127881 Merge "Glop support for custom textured UVs, simplify drawBitmap(src,dst)" 2015-02-26 00:04:20 +00:00
John Reck
fb10ffe484 Merge "Add null egl/gles stub support" 2015-02-26 00:01:48 +00:00
John Reck
041b985dbb Add null egl/gles stub support
Change-Id: I41372585202f69ef31a4ef95efc75fb7a1ff7289
2015-02-25 16:00:02 -08:00
Chris Craik
03ae272459 Remove renderer abstract class
No longer needed, allowing vast majority of methods on
OpenGLRenderer to be non-virtual.

Change-Id: I8a6ee042b95050dc666887579ef4e1c7a8f9b33b
2015-02-25 15:51:58 -08:00
Chris Craik
14100ac9f8 Glop support for custom textured UVs, simplify drawBitmap(src,dst)
Front load the scaling-to-support-shaders to record time.

Change-Id: I861c82d9d16d3c5e063cf87230127eed0b3f9b54
2015-02-25 10:18:46 -08:00
Narayan Kamath
23eeb2b8ae am 287c53f4: am 76507a64: am 72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '287c53f4a8bade1cb6c2dd2fe858da9c303e3e3d':
  Track removal of refcounts from FileMap.
2015-02-24 13:09:55 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
2015-02-24 12:56:52 +00:00
Chris Craik
bbcec73309 Merge "Fix atrace saveLayer flag logging" 2015-02-24 00:20:08 +00:00
Chris Craik
a7e5367b5c Fix atrace saveLayer flag logging
Change-Id: I5da85284c15316c9db4cc74011b855ef8c2f7cdd
2015-02-23 16:18:38 -08:00
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
Narayan Kamath
688ff4cf0f Track removal of refcounts from FileMap.
Use delete instead of release.

Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
2015-02-23 15:47:54 +00: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