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

6553 Commits

Author SHA1 Message Date
Chris Craik
48f650cb24 Track down unsupported texture target 
bug:19641517

Change-Id: Idc2e413abef5bb1438ffb3f52efb001504d3e89f
 2015-03-10 14:02:06 -07:00
Vishwath Mohan
6a2c23dc1b Prevent integer overflow in ResourceTypes 
Adds checks to 2 malloc() calls to ensure that the finally allocated
buffer size is not vulnerable to integer overflows. Also includes a
sanity check on the upper bound for type_info.numEntries before each
call.

Bug: 15171384
Change-Id: Ifdf0276bcca7e3d93da7c3577b9486d3c03a9d03
 2015-03-10 12:34:08 -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
Chris Craik
0a75d4e96c Merge "Rewrite glop texture asserts" 2015-03-09 20:40:08 +00:00
Chris Craik
eb911c2b0e Rewrite glop texture asserts 
bug:19641517

Also switch Glop VertexAttribFlags to use int for group of flags.

Change-Id: Ib7b1934197a62206a55baa6ab484ac59f5bec816
 2015-03-09 13:36:35 -07:00
Chih-Hung Hsieh
7830c81cd2 Merge "Fix unused local variale warning from clang/llvm." 2015-03-07 01:13:50 +00:00
Chih-Hung Hsieh
9ad6ac08a9 Fix unused local variale warning from clang/llvm. 
Change-Id: Ib9b5d06313e5bf933edfb38a4522929104c7917a
 2015-03-06 17:07:57 -08:00
John Reck
aa35d91905 Merge "Add percentiles" 2015-03-06 23:47:26 +00:00
John Reck
e70c5754d0 Add percentiles 
Change-Id: Ieb6badd177bb6f67dda199dfcb3e0f483c8c4e59
 2015-03-06 15:40:03 -08:00
Derek Sollenberger
c0bf700441 SkPorterDuff Multiply mode maps to SkXfermode modulate. 
bug:19627342
Change-Id: I97f26ca1bc8abe2768f4a12cc70fb0fa5d905098
 2015-03-06 13:51:04 -05:00
Chris Craik
97a351a329 Merge "Avoid invalid shader creation for certain blend modes" 2015-03-06 18:44:17 +00:00
Chris Craik
1c1c3fe9eb Avoid invalid shader creation for certain blend modes 
bug:19627342

Change-Id: I41e3c1ce8e6fa52f046ec492d19de7cab92b9ec5
 2015-03-06 10:05:15 -08:00
Derek Sollenberger
0313f2680c Remove uncessary include for SkPorterDuff.h 
Change-Id: Ibcbed5dd2dc327821fc26e87191185f0069c9911
 2015-03-05 16:22:17 -05:00
Tom Hudson
8124e6a98c Merge "Fix bug, change crashes to warnings" 2015-03-05 15:40:46 +00:00
Tom Hudson
b1476ae7d5 Fix bug, change crashes to warnings 
Improve behavior when we get a call to draw 0 points.
Replace one ALWAYS_FATAL statements with noop.

Change-Id: I864b7a9633dfa3dc6eefa403beca4cc7ae14074f
 2015-03-05 10:31:52 -05: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
9b98afca76 Merge "Glop DrawPatch support" 2015-03-03 18:12:27 +00:00
Chris Craik
e2e0073e88 Merge "Glop drawBitmaps, drawPatches" 2015-03-03 18:02:01 +00: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
e5c6584a40 Constructor cleanup 
Change-Id: Ic39911d08f44c3174de91fb92fcd4cab73fe4654
 2015-03-02 17:56:06 -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
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