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

4199 Commits

Author SHA1 Message Date
Jamie Gennis
7bea650208 Merge "SurfaceTexture: use fence sync on omap4 & s5pc110" 2012-01-27 09:53:14 -08:00
Stephen Hines
e3f9cc6761 Don't wait forever if there are no commands to execute. 
BUG=5614887

This fixes a timing issue where we could calculate a delay of 0 (indicating
wait forever) when we have no pending commands to actually execute. In such
cases, we should just break out of the playback loop.

This also fixes a small issue with returning whether or not to redraw.

Change-Id: Id1e481679341773256b7287062c68925e2bc8f9e
 2012-01-26 17:32:09 -08:00
Stephen Hines
6bd4c7ad4f am caaac348: Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 
* commit 'caaac348ed163f59cf1b8185bb14137050c18e7e':
  Fix bugs with unsigned rsAtomicCas/Max/Min.
 2012-01-26 13:58:14 -08:00
Stephen Hines
caaac348ed Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 2012-01-26 13:55:57 -08:00
Stephen Hines
109116bb2f Fix bugs with unsigned rsAtomicCas/Max/Min. 
BUG=5888007

rsAtomicMax/Min did not have proper semantics for unsigned integers. They were
always using signed comparisons. rsAtomicCas had the wrong function signature
in our math library, leading to no way to properly link/execute it.

Change-Id: I336cdd8cd9f2d8093f12e101b55b2797515f039b
 2012-01-25 18:17:34 -08:00
Romain Guy
68a1df6541 am 1a54368b: Merge "Add full support for Canvas.setDrawFilter()" 
* commit '1a54368b24a8cb88ee56ee746eae45171a43b89e':
  Add full support for Canvas.setDrawFilter()
 2012-01-23 17:12:28 -08:00
Romain Guy
5ff9df6582 Add full support for Canvas.setDrawFilter() 
Change-Id: I0ad35d0603c4eeda469014803be14c1dcdde918c
 2012-01-23 17:09:05 -08:00
Daniel Lam
f3d30e1c70 SurfaceTexture: use fence sync on omap4 & s5pc110 
This change enables the use of the EGL_KHR_fence_sync extension in
SurfaceTexture on omap4 and s5pc110 platforms.

Change-Id: Icad5245bab445413ffb8a7c823c296b678bf3250
 2012-01-22 15:51:41 -08:00
Stephen Hines
4cbe25a86b Fix potential bug with reordered size/offset arguments. 
This change also cleans up a few uint32_t/size_t issues.

Change-Id: Iae0fc085c12149129b91fce0ebbc28c8cf358eaf
 2012-01-20 19:21:35 -08:00
Romain Guy
86fcb90f3b am 22d41843: Fix the build, for real 
* commit '22d418437e44587cb0fba4353515719453269189':
  Fix the build, for real
 2012-01-19 18:36:34 -08:00
Romain Guy
22d418437e Fix the build, for real 
Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793
 2012-01-19 18:33:25 -08:00
Romain Guy
d79c3fbe59 am 4785a6ff: Merge "Full support for Canvas.drawPosText" 
* commit '4785a6ff8d48f51813611f2cab998b235ce2bbca':
  Full support for Canvas.drawPosText
 2012-01-18 18:03:23 -08:00
Romain Guy
4785a6ff8d Merge "Full support for Canvas.drawPosText" 2012-01-18 18:01:34 -08:00
Romain Guy
671d6cf460 Full support for Canvas.drawPosText 
This also introduces a small optimization when rendering text.

Change-Id: Iff620ac97bf878eaac406bccc6daa07052c93890
 2012-01-18 18:00:12 -08:00
Robert Ly
fda817416c am b41c96a3: am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit 'b41c96a374134c84558291fbb532fe490386a4ba':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:24:42 -08:00
Robert Ly
b41c96a374 am 43fda84e: am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 
* commit '43fda84e91b1fe356af35386d2f304d3ab71529e':
  update overview page for rs api docs to open iframe links in parent
 2012-01-18 13:21:51 -08:00
Romain Guy
3f096193fc am fb9ffe02: Merge "First pass at implementing Canvas.drawPosText() in GL" 
* commit 'fb9ffe02609c9c4ffca64927e72bc935cfe87768':
  First pass at implementing Canvas.drawPosText() in GL
 2012-01-17 17:42:49 -08:00
Romain Guy
eb9a5367e8 First pass at implementing Canvas.drawPosText() in GL 
Change-Id: Ia3ac347e95d57eb86c63045156c8dbc0572b03cb
 2012-01-17 17:39:26 -08:00
Glenn Kasten
06a864413f Thread::getTid returns pid_t gettid() after run 
This is needed when the parent or any other thread besides the child
needs access to the child's kernel tid.

Change-Id: Ib148505913eb78314cfd76657c30d7b20663dffd
 2012-01-17 09:38:23 -08:00
Stephen Hines
b97c8dd6eb am d36f7d24: Merge "Add support for new root.expand() calls." 
* commit 'd36f7d249591559e713a8ca45c6d452c14c94895':
  Add support for new root.expand() calls.
 2012-01-13 14:16:39 -08:00
Glenn Kasten
1d23caf617 am 1e808691: Get AID_GRAPHICS from right place 
* commit '1e80869133924e1ffff5c10ca787da303fd0b53d':
  Get AID_GRAPHICS from right place
 2012-01-13 14:16:35 -08:00
Jason Sams
68e9a8a6c8 Merge "Start implementing SurfaceTexture streaming into RS allocations." into graphics-dev 2012-01-13 14:02:26 -08:00
Jason Sams
615e7cee03 Start implementing SurfaceTexture streaming into RS allocations. 
Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b
 2012-01-13 14:01:20 -08:00
Stephen Hines
d36f7d2495 Merge "Add support for new root.expand() calls." 2012-01-13 13:57:24 -08:00
Glenn Kasten
1e80869133 Get AID_GRAPHICS from right place 
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
 2012-01-13 13:45:39 -08:00
Robert Ly
2eeb53c155 update overview page for rs api docs to open iframe links in parent 
Change-Id: Ic0aa77192fa19b045a7fd9df5926255511fdc3be
 2012-01-13 10:18:43 -08:00
Robert Ly
0272f1dfd7 cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62 
Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
 2012-01-13 10:07:20 -08:00
Stephen Hines
6b4cf07cab Add support for new root.expand() calls. 
BUG=5444144

Change-Id: I9ab942561a03e9f837a3199457259bb3e07ac76f
 2012-01-12 18:56:43 -08:00
Jason Sams
29d433290f Merge "Plumbing for RS priority." into graphics-dev 2012-01-12 14:23:49 -08:00
Jason Sams
17801f1eaa Plumbing for RS priority. 
Change-Id: Ibddfd40407fd6d24ac829a76a9a1e2047c48c5fd
 2012-01-12 14:22:21 -08:00
Mathias Agopian
e749769e74 am 2fdc357b: Merge "remove dead/usnused code" 
* commit '2fdc357bc66b97614455c5148562a5dfb650c1b7':
  remove dead/usnused code
 2012-01-12 10:38:50 -08:00
Mathias Agopian
0db7590ed2 remove dead/usnused code 
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
 2012-01-11 22:03:41 -08:00
Jason Sams
aa9565b1b2 Fix LOGE. 
Change-Id: I533bedf0827edb27e0aead78e2bb3389be85acd8
 2012-01-10 15:45:04 -08:00
Steve Block
f0b668cf7f am 38e90751: Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 
* commit '38e90751a25606459a9e571aa1b6c992d4c64151':
  Rename LOG_ASSERT to ALOG_ASSERT  DO NOT MERGE
 2012-01-10 14:46:36 -08:00
Alex Sakhartchouk
10f2a3c5b3 Merge "Now utilizing ability to bind constants. Fixing small copy/paste typo." into graphics-dev 2012-01-10 14:40:48 -08:00
Alex Sakhartchouk
b64ef770db Merge "Adding ability to bind constants to shaders." into graphics-dev 2012-01-10 14:39:59 -08:00
Alex Sakhartchouk
fdccec9c21 Now utilizing ability to bind constants. 
Fixing small copy/paste typo.

Change-Id: I8ca993f3e894214b710bea019dfd65822a4cd88f
 2012-01-10 14:30:34 -08:00
Alex Sakhartchouk
33680ff630 Adding ability to bind constants to shaders. 
Change-Id: I63b664fd2fec7e0c8157b7185782192132222f1a
 2012-01-10 10:16:52 -08:00
Steve Block
2e681c1b09 resolved conflicts for merge of 08289f55 to graphics-dev 
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
 2012-01-09 23:24:46 +00:00
Steve Block
ec193dec4d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
 2012-01-09 21:36:22 +00:00
Steve Block
3762c31172 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Steve Block
262a37f71b am f4c2294b: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 
* commit 'f4c2294b0156ca5a6919479142aa319963fdb727':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE
 2012-01-06 10:33:23 -08:00
Alex Sakhartchouk
95853e4e2b Merge "Cleanup based on comments." into graphics-dev 2012-01-06 09:41:52 -08:00
Steve Block
8564c8da81 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
 2012-01-06 10:07:54 +00:00
Fabrice Di Meglio
03b17a2df5 am d4a69b4a: Merge "Fix bug #5753006 Garbled Labels in Maps" 
* commit 'd4a69b4a1cb5b52035345abd8cb9595ae4cf9fa5':
  Fix bug #5753006 Garbled Labels in Maps
 2012-01-05 15:21:28 -08:00
Fabrice Di Meglio
d4a69b4a1c Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Alex Sakhartchouk
61cd943514 Cleanup based on comments. 
Change-Id: I2d261b3cd240b890001dcc7d2a849cfdc34328bf
 2012-01-05 14:55:11 -08:00
Steve Block
2893338442 am bd47cac4: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 
* commit 'bd47cac4dfc8440a848b33107cba1d6773f3e124':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE
 2012-01-05 14:09:25 -08:00
Steve Block
bd47cac4df Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
c511bee87c Fix bug #5753006 Garbled Labels in Maps 
- it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5
- basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting
from the Harfbuzz shaping
- also define GlyphID encoding as the default on the Paint class

Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd
 2012-01-05 13:30:54 -08:00