ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
47,578 Commits 2 Branches 0 Tags 54 MiB
a7da0dda39
Commit Graph

47578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
b96fe08540 Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev 2012-10-15 18:43:20 -07:00
Romain Guy
1cffc80f97 Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps 
Change-Id: I53ac91a9ce07b5dd5f2ee0e3cc5b65b6402f9229
 2012-10-15 18:13:05 -07:00
Jesse Hall
c558269b1a am 837d2f9e: Always set vertex alpha when drawing screenshot layers 
* commit '837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa':
  Always set vertex alpha when drawing screenshot layers
 2012-10-15 14:59:16 -07:00
Jesse Hall
837d2f9e83 Always set vertex alpha when drawing screenshot layers 
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.

Bug: 7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
 2012-10-15 12:38:33 -07:00
The Android Automerger
eec9e6456d merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-15 12:30:57 -07:00
The Android Open Source Project
935ba80962 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I50d7a0cbc6632c78a725810d960e049c310b3597
 2012-10-15 07:38:56 -07:00
The Android Automerger
286d5fad99 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-13 03:50:10 -07:00
Kenny Root
e2e95c8ccb am 9bdaa60b: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev 
* commit '9bdaa60b809b223d14619d1f13afdd38acb1738d':
  Add TEMP_FAILURE_RETRY around open and write calls
 2012-10-12 23:43:29 -07:00
Kenny Root
9bdaa60b80 Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev 2012-10-12 23:39:48 -07:00
The Android Automerger
58b6a67096 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:34 -07:00
The Android Automerger
37e0f65619 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 16:32:47 -07:00
Jamie Gennis
ec93e762af am dd57d551: Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev 
* commit 'dd57d551944c01394bc2807d962be4953c58c7c1':
  SurfaceFlinger: make the num FBs a board config
 2012-10-12 14:37:22 -07:00
Jamie Gennis
dd57d55194 Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev 2012-10-12 14:33:52 -07:00
Jamie Gennis
cdbaecb541 SurfaceFlinger: make the num FBs a board config 
Bug: 7283132
Change-Id: I38116f39fc18212f2daab94bbfc3daaf89439fc4
 2012-10-12 14:29:12 -07:00
Kenny Root
3de9cd2029 Add TEMP_FAILURE_RETRY around open and write calls 
Bug: 7330849
Change-Id: I9aef3c3d3a248c3eea7ca060124ad6decaa6b4da
 2012-10-12 11:37:58 -07:00
The Android Automerger
2d358c245f merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 10:26:47 -07:00
The Android Open Source Project
c5a70b1d24 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad
 2012-10-12 07:31:01 -07:00
Jamie Gennis
1efe099a51 BufferQueue: alloc without holding the lock 
This change makes BufferQueue::dequeueBuffer release its mutex before
allocating new buffers.  This should alleviate lock contention in
SurfaceFlinger where SF's main thread can get blocked waiting for an allocation
operation to complete.

Bug: 7335075
Change-Id: I1b000539cc616a695afab2e9c68507db69e57b13
 2012-10-11 20:08:26 -07:00
Jesse Hall
f5b27f7140 am b763d5ff: Assume LayerScreenshot has pre-multiplied alpha 
* commit 'b763d5fffa2f942a6ae3637fab17439dd32dbebc':
  Assume LayerScreenshot has pre-multiplied alpha
 2012-10-11 17:13:23 -07:00
The Android Automerger
a58b6a4bcd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 16:26:37 -07:00
Jesse Hall
42bac0bd1c am b82fb343: (-s ours) am e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)" 
* commit 'b82fb3431e5d62298b229f3b8758c832dee41f1d':
  Stop using transparent region for computing visible regions (DO NOT MERGE)
 2012-10-11 15:40:40 -07:00
Jesse Hall
b82fb3431e am e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)" 
* commit 'e3a669656ae891a510ccbd73d26559a20f5f466b':
  Stop using transparent region for computing visible regions (DO NOT MERGE)
 2012-10-11 15:39:34 -07:00
Jesse Hall
e3a669656a Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)" 2012-10-11 15:06:07 -07:00
The Android Automerger
8b4053a1aa merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-11 08:19:15 -07:00
The Android Open Source Project
9e7f65fdc9 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b
 2012-10-11 08:04:59 -07:00
The Android Automerger
0c1c3948d3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 07:03:50 -07:00
The Android Open Source Project
ca5aae2425 Reconcile with jb-mr1-release - do not merge 
Change-Id: I01ed0fa73e80b3868a53238a8e754970da2f6803
 2012-10-11 05:57:17 -07:00
Jesse Hall
b763d5fffa Assume LayerScreenshot has pre-multiplied alpha 
Bug: 7300129
Change-Id: Ie9114adc4b5c9a8cc3c65bfe6d9478b2cba4e0d8
 2012-10-10 21:40:26 -07:00
Andy McFadden
9349b5108c am f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev 
* commit 'f0c89b28be2e74c26d74b2a21b7228516f8c236f':
  Fix HDMI unblank behavior
 2012-10-10 19:37:57 -07:00
Andy McFadden
f0c89b28be Merge "Fix HDMI unblank behavior" into jb-mr1-dev 2012-10-10 19:34:11 -07:00
Andy McFadden
9e9689c111 Fix HDMI unblank behavior 
Two issues:

(1) We were announcing the hotplug event before we were ready to
handle blank/unblank events, so we were losing the initial unblank
that power manager sends us when HDMI is first plugged in.  This
left the display blank until you toggled the device power off/on.

(2) We were retaining fbTargetHandle for HDMI after the display was
disconnected.  The value didn't get updated when HDMI was reconnected
because the display was blank, so we didn't go through that code
path.  So, when HDMI was re-connected, we passed stale data into
the HWC.

Bug 7323938

Change-Id: I2335d24fd7b0f00bb23fc63aa7bcf44cb8857c73
 2012-10-10 18:17:51 -07:00
The Android Automerger
a9e3004d69 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 14:06:39 -07:00
Chet Haase
8b75830c5c am 8d5d2019: Revert "Add GL Error logs (temporary)" 
* commit '8d5d2019805df1f27cbec07eeca47dd5ab453dad':
  Revert "Add GL Error logs (temporary)"
 2012-10-10 13:21:39 -07:00
Chet Haase
8d5d201980 Revert "Add GL Error logs (temporary)" 
This reverts commit 2da2c15068.
 2012-10-10 13:10:40 -07:00
The Android Open Source Project
dc9c3a4f2b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a
 2012-10-10 09:44:41 -07:00
The Android Automerger
2de86a4e1b merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:55:31 -07:00
The Android Automerger
a4927aea77 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:29 -07:00
Mathias Agopian
43bd832d12 am 0acb00c2: Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev 
* commit '0acb00c2d780b60ed3d71be256460375dd8715b4':
  fix typo that prevented proper loging of EGL error code
 2012-10-09 16:57:47 -07:00
Jeff Brown
70f07572f8 am c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev 
* commit 'c5b58166e8170a415de108a72acfc432dec1b201':
  don't automatically unblank external displays
 2012-10-09 16:56:21 -07:00
Mathias Agopian
0acb00c2d7 Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev 2012-10-09 16:52:37 -07:00
Jeff Brown
c5b58166e8 Merge "don't automatically unblank external displays" into jb-mr1-dev 2012-10-09 16:50:56 -07:00
Mathias Agopian
b8fc00bfb4 fix typo that prevented proper loging of EGL error code 
needed for investigating 7309949

Bug: 7309949
Change-Id: If29a5c08d0e87f46b44ba2e1030be61cb4d1403b
 2012-10-09 16:44:48 -07:00
Mathias Agopian
98e52bdb18 am 45778999: Merge "Fence didn\'t manager sync_wait error codes properly" into jb-mr1-dev 
* commit '45778999c705683ec0fcca3e90c7e9969e081d93':
  Fence didn't manager sync_wait error codes properly
 2012-10-09 16:40:08 -07:00
Mathias Agopian
45778999c7 Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev 2012-10-09 16:36:30 -07:00
Mathias Agopian
3292cae8c3 don't automatically unblank external displays 
this should be handled by the display-manager. we were doing
that in SF because until recently we didn't have enough support
in the HAL. however, this is now causing other problems when
plugging hdmi while the screen is off for instance.

Bug: 7150885
Change-Id: I739b209056a765d38d05295cf202f67ee0f506ae
 2012-10-09 14:49:01 -07:00
Mathias Agopian
b5c9dcdf3b Fence didn't manager sync_wait error codes properly 
error codes are returned in errno, this caused ::waitForwever()
to only wait for 1 second and return improper error code (-1).

needed to help debugging 7316632

Bug: 7316632
Change-Id: Ie144f614a88393393972a3a770c6b4b0581f961a
 2012-10-09 14:38:19 -07:00
The Android Open Source Project
7776457df5 Reconcile with jb-mr1-release - do not merge 
Change-Id: I94b8cbf30ab7707320dc2de4ef8a8102ed5f6091
 2012-10-09 07:29:23 -07:00
The Android Automerger
c0609a2743 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 06:59:29 -07:00
Jeff Brown
e3a8cd4db1 am 2a09bb32: Add blankDisplay/unblankDisplay to SurfaceComposerClient. 
* commit '2a09bb321930e1f782599ec902bca1db58b9af77':
  Add blankDisplay/unblankDisplay to SurfaceComposerClient.
 2012-10-09 00:04:34 -07:00
Jeff Brown
2a09bb3219 Add blankDisplay/unblankDisplay to SurfaceComposerClient. 
Bug: 7309812
Change-Id: Ia401d642094a46c62f0d26c65da1d11341e203a1
 2012-10-08 19:13:57 -07:00