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

745 Commits

Author SHA1 Message Date
Chris Craik
31dbfc1b3e Fix glop usage for drawTextureLayer 
Change-Id: I45fcdfc9e3f41a687b6f4679f81e2b1f4479b9fc
 2015-03-30 15:42:23 -07:00
Chris Craik
e2bb380bc2 Use glops for text rendering 
Change-Id: I5e155c8baf3149f0ff231ec3c89dbff6bb8eae92
 2015-03-18 16:10:24 -07:00
Chris Craik
edacf22ca1 Merge "Glop based composeLayerRegion/Rect" 2015-03-10 16:29:14 +00:00
Chris Craik
182952f5ee Glop based composeLayerRegion/Rect 
Change-Id: I69440cabca84948e8aaead9479d616ebc2496517
 2015-03-09 18:06:32 -07:00
Chih-Hung Hsieh
9ad6ac08a9 Fix unused local variale warning from clang/llvm. 
Change-Id: Ib9b5d06313e5bf933edfb38a4522929104c7917a
 2015-03-06 17:07:57 -08:00
Chris Craik
8820fd1d82 Patch cleanup, reenable Patch Glops 
bug:19597454

Change-Id: If12b95e83588b81a553210cd8c2437c6c771073a
 2015-03-04 15:32:47 -08:00
Chris Craik
a9761e698e Temporarily disable Patch glops 
bug:19597454

Change-Id: I9dbe781a714582717a5585113b9a56821265b36e
 2015-03-04 14:25:10 -08:00
Chris Craik
0556d90253 Glop DrawPatch support 
Change-Id: Icaa78bdb2cf52c1fc2194ec4016634967d17fb6a
 2015-03-03 09:54:14 -08:00
Chris Craik
a6b52198b9 Glop drawBitmaps, drawPatches 
Change-Id: I3f1cd3f47f97d2e0c9b9d153732e26ee0b1c58c2
 2015-03-03 08:58:14 -08:00
Chris Craik
083e733e82 Cleanup of FontRenderer 
Remove invalid and over complicated buffer unbinding
optimization, and simplify constructor.

Change-Id: I3dd90528de4f377e972bbd7967e7e232875387e4
 2015-02-27 17:09:02 -08:00
Chris Craik
6b109c7498 Fix glop rendering within unclipped saveLayers 
bug:19541881

Additionally, clean up GlopBuilders
and rename onGetSnapshot() for clarity

Change-Id: I0303e4cd61eef87cf80af2d968c4aa67193cd008
 2015-02-27 16:13:26 -08:00
Chris Craik
26bf34200e Glop TextureLayer support 
Change-Id: I348a926bd4a2f47be9fdbe74058c0aa2f8dc6276
 2015-02-27 10:50:12 -08:00
Chris Craik
ef2507439c Glop mesh reorg, support for drawBitmapMesh 
Change-Id: Iaf5550bdd93da93e59a5b838234ab5612e067387
 2015-02-26 10:56:07 -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
Chris Craik
f27133df2d Glop layer mesh rendering 
Change-Id: I2d902819d5d77f496b67d4d25a298782903e410d
 2015-02-19 18:06:05 -08: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
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
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
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
44eb2c0086 Refactor blending and texture gl state 
Change-Id: Ia6b3c8b2afd3dfcee7f3ce401d846b789612054a
 2015-01-30 10:49:05 -08: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
Rob Tsuk
f28f5cec56 Merge "Clipping performance improvements" 2015-01-15 18:21:35 +00:00
Rob Tsuk
487a92caef Clipping performance improvements 
Create a ClipArea class to handle tracking clip regions. This class can
select the most efficient implementation depending on the types of
clipping presented.

ClipArea re-used the rectangle and region-based clipping
implementations as well as adding a "list of rotated rectangles"
approach that is more efficient for rotated views with children.

Change-Id: I2133761a2462ebc0852b394220e265974b3086f0
 2015-01-14 17:24:58 -08:00
Derek Sollenberger
3d4eed7f1a Update HWUI to store its own SkBitmap objects 
This enables us to...

1) simplify the lifecycle/ownership between Java and HWUI
2) remove DisplayListRenderer::drawBitmapData and associated logic
3) track pixel lifecycle using standard SkPixelRef refcounting
4) Remove uncessary calls to ref/unref the bitmap's pixels and colorTable

Change-Id: I3c95078da20995444f6388a029414280fd654318
 2015-01-09 13:56:56 -05:00
Tom Hudson
8dfaa49042 Make DisplayListRenderer inherit from Canvas, merge JNI 
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.

Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.

bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
 2015-01-05 15:25:41 -08:00
Chris Craik
51d6a3db97 Cleanup various clang warnings, use unique_ptrs in several places 
Change-Id: I347904b25e51fcc7de14b1e72f1acd0f6ba26f3f
 2014-12-23 16:53:56 -08:00
Chris Craik
e84a208317 Add overrides and switch to nullptr keyword 
Changes generated with clang-modernize.

Additionally, fixed some struct-vs-class usage to make clang happy.

Change-Id: Ic6ef2427401ff1e794d26f21f7b44868fc75fb72
 2014-12-22 14:56:08 -08:00
Chris Craik
07adacf499 Cleanup 
Change-Id: I91ffb9c66697741116fdeaa31abdf6cfd79155df
 2014-12-22 11:20:57 -08:00
Chris Craik
a5f0918ec1 resolved conflicts for merge of fd461ede to master 
Change-Id: I36f263c7e6d96355dd8a2c3565581b9a983ae481
 2014-12-17 15:11:30 -08:00
Chris Craik
fd461edee0 am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 
* commit '93492d1a478770783abab764855c8d47e0264f71':
  Revert overdraw avoidance visualization change
 2014-12-17 22:17:21 +00:00
Chris Craik
c748832f75 Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev 2014-12-17 22:07:04 +00:00
Chris Craik
ef8d6f272a Revert overdraw avoidance visualization change 
bug:18787324

Partial revert of 23d307c8d88f4a3849163b9e5b7cd11d0d4f372c.

Change-Id: Ic8b91b046707fc5b8fa53c35ea7b37bb19c3c943
 2014-12-17 11:21:02 -08:00
John Reck
f088c349df Fix style 
Change-Id: I7227b0eac126bf470ed50249a7809b845872983b
 2014-12-12 09:49:29 -08:00
Yohann Roussel
59cf734f9e resolved conflicts for merge of d67bb501 to master 
Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555
 2014-12-11 11:10:50 +01:00
John Reck
d67bb5015f am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev 
automerge: e4a6ed9

* commit 'e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7':
  Don't preload textures for AssetAtlas
 2014-12-11 01:25:54 +00:00
John Reck
eb2dcc791e Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev 2014-12-11 01:12:31 +00:00
John Reck
ebd52610cf Don't preload textures for AssetAtlas 
Bug: 18317479

RenderNode::prepareSubTree calls prefetchAndMarkInUse
on every bitmapResoruce in the DisplayList. However,
this resulted in textures being uploaded for bitmaps
that would be drawn from the AssetAtlas instead.

To fix this we teach TextureCache about the AssetAtlas
so that calls to TextureCache return the Texture from
AssetAtlas if it exists. Thus usage of AssetAtlas
is now purely to allow for further optimizations via
draw merging instead of a requirement to get
any benefit at all.

Change-Id: I65282fa05bac46f4e93822b3467ffa0261ccf200
 2014-12-10 17:07:41 -08:00
Chris Craik
e2831a181f resolved conflicts for merge of 5369b769 to master 
Change-Id: Iccb2ce948321534e05d67e64dc40a38332adb1a7
 2014-12-10 17:05:43 -08:00
Chris Craik
5369b76963 resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp. 
Change-Id: Ib9d6d301282bbaae6b23b9ce07b9e6a4e9075991
 2014-12-10 15:23:54 -08:00