4259 Commits

Author SHA1 Message Date
Jeff Brown
9dc348d756 Merge "Fix spurious ANRs in native activities." 2012-03-13 15:15:48 -07:00
Jeff Brown
2b6c32ca41 Fix spurious ANRs in native activities.
Some native activities experienced ANRs when the input consumer
deferred an input event due to client-side batching.  If the
input channel was fully emptied then the client had no way of
knowing that it should wake up to handle the deferred input event.

This patch also fixes some lock issues in the native activity
input queue implementation.  In at least one error case, it
was possible for a function to exit without releasing the lock.

Bug: 6051176
Change-Id: I4d9d843237e69b9834f8d8b360031b677fcab8c3
2012-03-13 15:00:09 -07:00
Chet Haase
491189f6bb Fix garbage deref with DisplayList property structures
This is the real fix to issue 6158892. We currently delete
transform/camera structures at DisplayList destructor time, if these
structures are not NULL. We set the fields to NULL in an init() method
called (eventually) by the constructor. But it is possible for the object
to be destroyed before that init code is called, resulting in the deref
bug reported. The fi is to set these structures to NULL directly in the
constructor.

Issue 6158892i: Device runtime restarts frequently

Change-Id: Ibfa0f9314767eed6fd51f4ec7edc0d0edd5fdd0f
2012-03-13 11:42:34 -07:00
Romain Guy
3c9d9c18b4 Merge "Follow the include style used elsewhere in the library" 2012-03-13 11:19:26 -07:00
Romain Guy
d5a85fb63d Follow the include style used elsewhere in the library
Change-Id: I14aebdaeb04b6f4c611153ece4ac1f6ad9bfc15f
2012-03-13 11:18:20 -07:00
Chet Haase
866ed817d0 Fix garbage deref in DisplayList structures
Issue #6158892: Device runtime restarts frequently

Change-Id: I4e6afaaf9ac66d6846caf0ed82ea67163d8b15c2
2012-03-13 11:13:36 -07:00
Chet Haase
a1cff5043d Handle view properties at the native level
Basic functionality of handling View properties (transforms,
left/right/top/bottom, and alpha) at the native DisplayList level.
This logic is disabled for now (via compile-time flags in View.java and
DisplayListRenderer.h) as we continue work on it (there is no advantage
to the new approach until we optimize invalidation and rendering paths
to use the new code path).

Change-Id: I370c8d21fbd291be415f55515ab8dced6f6d51a3
2012-03-12 15:41:48 -07:00
Stephen Hines
3c4b03d484 Merge "Fix argument passing with dimLOD." 2012-03-12 14:45:32 -07:00
Stephen Hines
d091526841 Fix argument passing with dimLOD.
BUG=6152130

Change-Id: I5c857b692af8ec45e4cbef8140c44d72aec6600e
2012-03-12 14:42:05 -07:00
Romain Guy
6e0621794d Merge "Turn down the number of glGetError() calls." 2012-03-12 12:58:21 -07:00
Romain Guy
3fe4eb9c60 Turn down the number of glGetError() calls.
glGetError() was invoked every time a display list was updated. This
was unnecessary since display list updates do not execute OpenGL code.

Change-Id: Ia0a75a65ccf2a4701fb3a828848cd0c42f256c6c
2012-03-12 12:49:41 -07:00
Alex Sakhartchouk
e1dd94b1a0 Merge "Split off driver code into a separate static library." 2012-03-12 09:52:47 -07:00
Romain Guy
772a73963d Merge "Don't bind data to missing uniforms" 2012-03-09 17:38:11 -08:00
Romain Guy
55fd2c9b2e Don't bind data to missing uniforms
Change-Id: Ib9d1f14eb0bef04e0910baa4eaf3e49cce81c0ce
2012-03-09 17:37:29 -08:00
Alex Sakhartchouk
50159b1f6a Split off driver code into a separate static library.
Change-Id: I055a6d7aecf3663e5e399a0ddee068cc33eca666
2012-03-09 15:04:23 -08:00
Alex Sakhartchouk
6df8876f79 Merge "More header untangling." 2012-03-09 13:31:41 -08:00
Dianne Hackborn
6c8683987d Merge "Fix issue #6054627: resource matching issue of size qualifiers" 2012-03-09 13:26:35 -08:00
Dianne Hackborn
5c6dfeb1fb Fix issue #6054627: resource matching issue of size qualifiers
Resource matching would incorrectly identify two configs with the
same value as better than.

Change-Id: I7297dcf58fd5a43f1a5ff53bb093eeeb2cad090f
2012-03-09 13:17:17 -08:00
Alex Sakhartchouk
bedc023170 More header untangling.
Change-Id: I090943775cbda8d9515cdb484957f6b05d5b1799
2012-03-09 10:47:27 -08:00
Alex Sakhartchouk
a7e6f3a704 Merge "Starting to untangle header spaghetti." 2012-03-09 09:55:30 -08:00
Alex Sakhartchouk
137ccbb8de Starting to untangle header spaghetti.
Change-Id: I31f38d05dc8b55c659e8c7e9c0a87b94b9ac1db5
2012-03-09 09:24:39 -08:00
Alex Sakhartchouk
c31424e6c5 Merge "Moving lod's into hal struct." 2012-03-09 08:43:26 -08:00
Alex Sakhartchouk
3b88729d2b Moving lod's into hal struct.
Change-Id: Iaec34fea7c002d7948d91df6b7a1af7f832f74ea
2012-03-08 14:52:36 -08:00
Mathias Agopian
8c79817dc6 remove files that moved to frameworks/native
Change-Id: I140d291e520097b1148930f736823650e08488f7
2012-03-07 19:36:08 -08:00
Mathias Agopian
08965ec67a fixup hardcoded include paths for new project
Change-Id: Id443ec5c99bb4d7653905f1be1f72a029e0cf087
2012-03-07 19:34:36 -08:00
Jamie Gennis
ac3c33745f Merge "BufferQueue: fixed issues with buffer slots not available" 2012-03-07 15:48:11 -08:00
Mathias Agopian
fc004c1350 Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect" 2012-03-07 14:18:54 -08:00
Daniel Lam
c930cf3cf3 BufferQueue: fixed issues with buffer slots not available
Bug: 6120953
Change-Id: Ief43f042ee9e1512e86fff8632a1c9dd31bdff35
2012-03-07 14:15:34 -08:00
Glenn Kasten
ff249c0dc8 Merge "Remove references to sched_policy.h in RS" 2012-03-07 07:16:46 -08:00
Mathias Agopian
3e964c55ac attempt to fix a deadlock in SurfaceTextureClient::disconnect
- condition wasn't signaled if an error happened between acquire and release
- also replace signal with broadcasts

Bug: 6109450
Change-Id: Iaf9371b829f772f559daae42e06d4dbd9505d6a0
2012-03-06 18:26:54 -08:00
Glenn Kasten
66199cf939 Merge "Remove obsolete references to sched_policy.h" 2012-03-06 08:17:43 -08:00
Derek Sollenberger
6d159451bb Merge "Add missing includes for Mutex.h" 2012-03-06 05:27:31 -08:00
Mathias Agopian
18364b31fc Merge "Add ATRACEs for Buffer indices" 2012-03-05 19:41:29 -08:00
Glenn Kasten
403475a894 Remove obsolete references to sched_policy.h
As part of scheduling policy cleanup, remove or isolate
all references to the scheduling policy APIs.

Change-Id: Ia1ea2fe711a399039f25217309e061267744b856
2012-03-05 18:12:45 -08:00
Glenn Kasten
583786175e Remove references to sched_policy.h in RS
As part of scheduling policy cleanup, removing some references to
sched_policy.h and its APIs.  Activity manager should be responsible
for configuring scheduling policy, rather than leaving it up to each app.

Change-Id: Iffe972799bf3fde090b1efdd3abce5141e4d261e
2012-03-05 17:24:39 -08:00
Derek Sollenberger
029f64303b Add missing includes for Mutex.h
The missing header was being transitively included through a
Skia header which is being removed.

Change-Id: I5a65bae076027951fe07d1e7eecd4732124fb0e4
2012-03-05 16:48:32 -05:00
Romain Guy
bb0acdf9e1 Delete display list objects and resources on the UI thread
Bug #6073717
Bug #6065504
Bug #6026515
Bug #5971725

Prior to this patch, the destructor of DisplayList would always run
on the finalizer thread. This could cause a race condition if the UI
thread was busy rendering display lists at the same time leading to
various random native crashes.

Change-Id: Ie11108e3b1538d4b358a1a8b4cce1b2d33152d0c
2012-03-05 13:44:35 -08:00
Romain Guy
fb9c41c206 Merge "Deferred layer updates" 2012-03-05 13:20:46 -08:00
Mathias Agopian
303a067373 Merge "BufferQueue: fixed acquire operation" 2012-03-05 12:09:45 -08:00
Alex Sakhartchouk
c730aceb64 Merge "Add multisampling support to renderscript." 2012-03-05 08:30:31 -08:00
Alex Sakhartchouk
e7de7258ed Merge "Using surface texture as a default renderscript surface." 2012-03-05 08:29:57 -08:00
Romain Guy
2bf68f063b Deferred layer updates
Change-Id: I83d9e564fe274db658dcee9e0cc5bbf9223ebb49
2012-03-02 13:37:47 -08:00
Daniel Lam
d137cc7c92 BufferQueue: fixed acquire operation
Bug: 6082872
Change-Id: I897dc61eb84fed953e51f97871cd3ae6321505d4
2012-03-02 11:30:56 -08:00
Mathias Agopian
d1220b904d Add ATRACEs for Buffer indices
Change-Id: I44d7a9a9bf03f418cab2a4854583aac9e533daee
2012-03-01 22:20:24 -08:00
Mathias Agopian
7e5f1e8dc0 Merge "add more tracing for buffer allocation" 2012-03-01 21:22:35 -08:00
Romain Guy
ad1daaa87b Remove stray log
Change-Id: I0c1979aab395098651c8a63d0bae0198ebc3746b
2012-03-01 17:33:42 -08:00
Romain Guy
d8f45c16a8 Merge "Small tweak to Canvas.drawPath() GL implementation" 2012-03-01 12:11:59 -08:00
Romain Guy
dd7c8e4c68 Small tweak to Canvas.drawPath() GL implementation
Change-Id: I1d668a912996e1267bcf2127058888e489a2d9b3
2012-03-01 12:08:38 -08:00
Alex Sakhartchouk
541b492d49 Merge "Allocation sampling api prototypes." 2012-03-01 09:43:43 -08:00
Mathias Agopian
09264d5248 add more tracing for buffer allocation
Change-Id: I8408850d0625985992ef2e2cd0c9f300b1fca293
2012-02-29 20:47:20 -08:00