OSDN Git Service

android-x86/frameworks-native.git
10 years agofix crashers with wifi/virtual displays
Mathias Agopian [Thu, 26 Sep 2013 03:40:07 +0000 (20:40 -0700)]
fix crashers with wifi/virtual displays

Bug: 10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 22 Sep 2013 17:51:13 +0000 (10:51 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoGLConsumer: Add query for current frame number.
Eino-Ville Talvala [Thu, 19 Sep 2013 20:36:07 +0000 (13:36 -0700)]
GLConsumer: Add query for current frame number.

Surface the underlying frame number of the current texture.

Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653

10 years agoreinstate black-screenshot debugging code
Mathias Agopian [Fri, 20 Sep 2013 00:08:37 +0000 (17:08 -0700)]
reinstate black-screenshot debugging code

turned off by default.

Bug: 10809349
Change-Id: I3e6b8c7860e6b0e122b8f07de4020967cd1f005c

10 years agoMerge "Fix GLES context version selection" into klp-dev
Mathias Agopian [Thu, 19 Sep 2013 22:29:30 +0000 (22:29 +0000)]
Merge "Fix GLES context version selection" into klp-dev

10 years agoGLConsumer: Add query for current frame number.
Eino-Ville Talvala [Thu, 19 Sep 2013 20:36:07 +0000 (13:36 -0700)]
GLConsumer: Add query for current frame number.

Surface the underlying frame number of the current texture.

Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 19 Sep 2013 13:01:50 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoFix GLES context version selection
Mathias Agopian [Wed, 18 Sep 2013 23:20:26 +0000 (16:20 -0700)]
Fix GLES context version selection

Explicitly selects an ES 2.0 config first, then an ES 1.x config,
before attempting the fallback path for the emulator.

Bug: 10820214
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d

10 years agofix camera API 2.0 orientation
Mathias Agopian [Wed, 18 Sep 2013 06:45:22 +0000 (23:45 -0700)]
fix camera API 2.0 orientation

we add a flag to ANativeWindow::setBufferTransform that means
"apply the inverse rotation of the display this buffer is displayed
onto to".

Bug: 10804238
Change-Id: Id2447676271950463e8dbcef1b95935c5c3f32b2

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 04:11:23 +0000 (21:11 -0700)]
merge in klp-release history after reset to klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 18 Sep 2013 00:39:56 +0000 (17:39 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoFix build (tests)
Mathias Agopian [Tue, 17 Sep 2013 22:55:18 +0000 (15:55 -0700)]
Fix build (tests)

Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6

10 years agoMerge "Make sure do disconnect from a BQ when its client dies." into klp-dev
Mathias Agopian [Tue, 17 Sep 2013 21:31:13 +0000 (21:31 +0000)]
Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev

10 years agoMerge "Fix for AOSP fusion sensors not handling multiple clients correctly." into...
Aravind Akella [Tue, 17 Sep 2013 18:17:50 +0000 (18:17 +0000)]
Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev

10 years agoMerge "Sensor Batching Bug fixes." into klp-dev
Aravind Akella [Tue, 17 Sep 2013 17:49:26 +0000 (17:49 +0000)]
Merge "Sensor Batching Bug fixes." into klp-dev

10 years agoMerge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
Amith Yamasani [Tue, 17 Sep 2013 15:56:23 +0000 (15:56 +0000)]
Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 17 Sep 2013 13:01:01 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge "Stop using default value for Surface producerControlledByApp parameter" into...
Jesse Hall [Tue, 17 Sep 2013 03:27:15 +0000 (03:27 +0000)]
Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev

10 years agoMake sure do disconnect from a BQ when its client dies.
Mathias Agopian [Thu, 12 Sep 2013 02:35:45 +0000 (19:35 -0700)]
Make sure do disconnect from a BQ when its client dies.

Bug: 5679534

Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53

10 years agoFix for AOSP fusion sensors not handling multiple clients correctly.
Aravind Akella [Mon, 16 Sep 2013 22:37:41 +0000 (15:37 -0700)]
Fix for AOSP fusion sensors not handling multiple clients correctly.

Bug: 10786801
Change-Id: I7b938bc583a303a30237c3d93b5accbf64cc90b5

10 years agoStop using default value for Surface producerControlledByApp parameter
Jesse Hall [Mon, 16 Sep 2013 22:24:53 +0000 (15:24 -0700)]
Stop using default value for Surface producerControlledByApp parameter

Bug: 10785749
Change-Id: Ifbf9340e5eabe621a69e990ec3e05ac51f8db66a

10 years agoSensor Batching Bug fixes.
Aravind Akella [Fri, 6 Sep 2013 00:03:38 +0000 (17:03 -0700)]
Sensor Batching Bug fixes.

i) SensorService dropping events. Increase SOCKET_BUFFER_SIZE in BitTube ctor.
ii) Call flush before every activate.
iii) Emulate flush for older devices. Add a trivial flush complete event when flush is called.

Bug: 10641596
Change-Id: I30d0f3948e830457143f16e157b6ad81908687ce

10 years agoDisable the egl_khr_gl_colorspace extension
Jesse Hall [Sun, 15 Sep 2013 04:00:14 +0000 (21:00 -0700)]
Disable the egl_khr_gl_colorspace extension

Bug: 10777398
Change-Id: Ib50ea8b9d5d960537701b85929d6312304993a0f

10 years agoEnable FEATURE_DEVICE_ADMIN for handheld devices
Amith Yamasani [Mon, 16 Sep 2013 17:48:35 +0000 (10:48 -0700)]
Enable FEATURE_DEVICE_ADMIN for handheld devices

Bug: 9520957
Change-Id: I9c09dc726509db9e6d9ba4700255c74528b9f9fa

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 12 Sep 2013 13:01:32 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agofix a few problems with BitTube
Mathias Agopian [Tue, 10 Sep 2013 06:36:25 +0000 (23:36 -0700)]
fix a few problems with BitTube

BitTube used to send objects one at a time and didn't
handle errors properly.

We now send all the objects in one call, which means they
have to be read as a single batch as well. This changes the
BitTube API.

Update SensorService to the new API.

Also added an API to set the size of the send buffer.

Bug: 10641596
Change-Id: I77c70d35e351fdba0416fae4b7ca3b1d56272251

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 9 Sep 2013 13:01:45 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agofix a possible null dereference when eglMakeCurrent() fails
Mathias Agopian [Fri, 6 Sep 2013 20:36:49 +0000 (13:36 -0700)]
fix a possible null dereference when eglMakeCurrent() fails

Bug: 10648797
Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e

10 years agoMerge "color blindness enhancement" into klp-dev
Mathias Agopian [Fri, 6 Sep 2013 02:09:42 +0000 (02:09 +0000)]
Merge "color blindness enhancement" into klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 5 Sep 2013 13:01:25 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agocolor blindness enhancement
Mathias Agopian [Mon, 2 Sep 2013 04:36:12 +0000 (21:36 -0700)]
color blindness enhancement

This is an attempt at improving the experience of
users with color vision impairement.

At this time this feature can only be enabled for
debugging:

  adb shell service call SurfaceFlinger 1014 i32 PARAM

  with PARAM:
   0 : disabled
   1 : protanomaly/protanopia simulation
   2 : deuteranomaly/deuteranopia simulation
   3 : tritanopia/tritanomaly simulation
  11, 12, 13: same as above w/ attempted correction/enhancement

The enhancement algorithm tries to spread the "error"
such that tones that would otherwise appear similar can be
distinguished.

Bug: 9465644

Change-Id: I860f7eed0cb81f54ef9cf24ad78155b6395ade48

10 years agoFix issue #10422349: Limit/change the battery history data in batterystats
Dianne Hackborn [Thu, 5 Sep 2013 01:04:14 +0000 (18:04 -0700)]
Fix issue #10422349: Limit/change the battery history data in batterystats

Use new compact option to include history when dumping battery stats.

Change-Id: I3833a88db76d8791bd5c2e8f6ff414af65472a42

10 years agoMerge "HDCP: add enums for HDCP module capabilities" into klp-dev
Chong Zhang [Wed, 4 Sep 2013 22:07:46 +0000 (22:07 +0000)]
Merge "HDCP: add enums for HDCP module capabilities" into klp-dev

10 years agoHDCP: add enums for HDCP module capabilities
Chong Zhang [Tue, 3 Sep 2013 21:17:58 +0000 (14:17 -0700)]
HDCP: add enums for HDCP module capabilities

This change adds the enums for HDCP caps. An interface getCaps()
will be added later for querying whether HDCP module supports
encryption from a native buffer output from the encoder.

Bug: 10609422

Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 4 Sep 2013 13:01:18 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge "Sensor batching. Changes to the native code." into klp-dev
Aravind Akella [Wed, 4 Sep 2013 00:41:41 +0000 (00:41 +0000)]
Merge "Sensor batching. Changes to the native code." into klp-dev

10 years agoSensor batching. Changes to the native code.
Aravind Akella [Thu, 27 Jun 2013 19:04:23 +0000 (12:04 -0700)]
Sensor batching. Changes to the native code.

Bug: 10109508
Change-Id: I7333f3aac76125a8226a4c99c901fb904588df04

10 years agoimprove mat44 implementation
Mathias Agopian [Mon, 2 Sep 2013 04:35:36 +0000 (21:35 -0700)]
improve mat44 implementation

this will make it easier to create matrices of different sizes

Change-Id: I2c1771ba0823c42d737762e2dfc2cd47eb302767

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 2 Sep 2013 13:01:13 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge changes I8283a989,I64add89a into klp-dev
Mathias Agopian [Sat, 31 Aug 2013 01:30:10 +0000 (01:30 +0000)]
Merge changes I8283a989,I64add89a into klp-dev

* changes:
  switch to use mat4
  vector and matrix classes for graphics use

10 years agoMerge "Force async behavior for the virtual display output BufferQueue" into klp-dev
Jesse Hall [Fri, 30 Aug 2013 21:14:55 +0000 (21:14 +0000)]
Merge "Force async behavior for the virtual display output BufferQueue" into klp-dev

10 years agoForce async behavior for the virtual display output BufferQueue
Jesse Hall [Thu, 29 Aug 2013 23:03:50 +0000 (16:03 -0700)]
Force async behavior for the virtual display output BufferQueue

Bug: 10551087
Change-Id: I40bbb2b87d64420939a0ea309254f281437dab56

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 29 Aug 2013 13:01:02 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agominor clean-up of the GLESRenderer
Mathias Agopian [Thu, 29 Aug 2013 01:13:56 +0000 (18:13 -0700)]
minor clean-up of the GLESRenderer

Change-Id: I978dea25b7687fbbbb283f09c24e115d9bad49a2

10 years agoreset the gl viewport at each frame for each display
Mathias Agopian [Thu, 29 Aug 2013 01:11:46 +0000 (18:11 -0700)]
reset the gl viewport at each frame for each display

Bug: 100971289506003
Change-Id: Ie0403a631e339a9134216224f3366f46ece58b53

10 years agoremove adreno 130 workaround support
Mathias Agopian [Wed, 28 Aug 2013 22:27:30 +0000 (15:27 -0700)]
remove adreno 130 workaround support

Change-Id: I8ea5ee65d405114b30cfaa44e1a0c971d1ef2a61

10 years agotry to keep omap4 alive
Mathias Agopian [Wed, 28 Aug 2013 22:22:29 +0000 (15:22 -0700)]
try to keep omap4 alive

Bug: 10527646
Change-Id: Iec572a910e932115cf4f2e1215142b10cd91bd6f

10 years agoswitch to use mat4
Mathias Agopian [Tue, 27 Aug 2013 03:42:07 +0000 (20:42 -0700)]
switch to use mat4

Change-Id: I8283a989cfd2b74d53958150bc90298bc083fee7

10 years agovector and matrix classes for graphics use
Mathias Agopian [Thu, 22 Aug 2013 06:10:41 +0000 (23:10 -0700)]
vector and matrix classes for graphics use

- this implements vec2, vec3, vec4, which are float vectors
of size 2, 3 and 4 respectively.

the code allows easy instantiation of vectors of a different
type via the tvec{2|3|4}<T> template classes.

- this also implements mat4 which is a float 4x4 matrix. the
tmat44<T> template class allows easy instantiation of a
4x4 matrix of a different value_type.

The vector types have some minimal support for the
glsl style swizzled access; for instance:

  vec4 u;
  vec3 v = u.xyz;

only .x, .xy, .xyz and their .stpq / .rgba equivalent are
supported.

most operators are supported on both vector and matrices:
arithmetic, unary, compound assignment and comparison
(bit-wise operators NOT supported).

- operations available on vectors include:
dot, length, distance, normalize and cross

- operations available on matrices include:
transpose, inverse, trace

- and a few utilities to create matrices:
ortho, frustum, lookAt

Change-Id: I64add89ae90fa78d3f2f59985b63495575378635

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 26 Aug 2013 13:01:12 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge changes I34935d21,If423cd29 into klp-dev
Mathias Agopian [Sat, 24 Aug 2013 00:12:41 +0000 (00:12 +0000)]
Merge changes I34935d21,If423cd29 into klp-dev

* changes:
  handle several vsync signal correctly
  only use format compatible with CPU consumers

10 years agoMerge "make sure SF initialization is ran at target priority and correct thread group...
Mathias Agopian [Sat, 24 Aug 2013 00:12:05 +0000 (00:12 +0000)]
Merge "make sure SF initialization is ran at target priority and correct thread group" into klp-dev

10 years agomake sure SF initialization is ran at target priority and correct thread group
Mathias Agopian [Fri, 23 Aug 2013 22:56:38 +0000 (15:56 -0700)]
make sure SF initialization is ran at target priority and correct thread group

SF can spawn threads (indirectly) during initialization
and we want those to be spawned at URGENT_DISPLAY_PRIORITY
(in theory they should set their own, but some code lives
in vendor libraries and doesn't).

Bug: 10430209
Change-Id: I5b3a8f979297de287614c8eafd8267bef1176e4b

10 years agofix DimLayer in GLES2.0 SF
Mathias Agopian [Fri, 23 Aug 2013 23:12:34 +0000 (16:12 -0700)]
fix DimLayer in GLES2.0 SF

DimLayer state wasn't initialized properly.

Bug: 10442967
Change-Id: I384c1d85c58c96ae29d5daa1fabee9f4ce003501

10 years agoRemove input flinger stubs. (DO NOT MERGE)
Jeff Brown [Fri, 23 Aug 2013 01:34:33 +0000 (18:34 -0700)]
Remove input flinger stubs.  (DO NOT MERGE)

Bug: 10446930
Change-Id: I4dd46f539cd2a2e324dfc83b45ba2787f7404a4a

10 years agoMerge "Add ability to test supported content types to MediaDrm" into klp-dev
Jeff Tinker [Thu, 22 Aug 2013 23:08:09 +0000 (23:08 +0000)]
Merge "Add ability to test supported content types to MediaDrm" into klp-dev

10 years agoMerge "Surface: Fix controlledByApp parameter" into klp-dev
Eino-Ville Talvala [Thu, 22 Aug 2013 19:23:27 +0000 (19:23 +0000)]
Merge "Surface: Fix controlledByApp parameter" into klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 22 Aug 2013 13:01:19 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agohandle several vsync signal correctly
Mathias Agopian [Thu, 22 Aug 2013 00:45:46 +0000 (17:45 -0700)]
handle several vsync signal correctly

Change-Id: I34935d2197ce8e914fef2f110896e47b44225ad2

10 years agoonly use format compatible with CPU consumers
Mathias Agopian [Wed, 21 Aug 2013 23:36:34 +0000 (16:36 -0700)]
only use format compatible with CPU consumers

EGL now picks the buffer format out of a small set
of formats compatible with CPU consumers instead of
using the EGL_NATIVE_VISUAL_ID.

Bug: 10194508
Change-Id: If423cd29601b7a3ace8670f4c73004132cfc4b31

10 years agoAdd ability to test supported content types to MediaDrm
Jeff Tinker [Wed, 21 Aug 2013 18:57:40 +0000 (11:57 -0700)]
Add ability to test supported content types to MediaDrm

bug: 10244066
Change-Id: I6666d0dbfdc6e791deb9a82c918255af4fa19816

10 years agoscreenshot layers wouldn't work in some cases
Mathias Agopian [Wed, 21 Aug 2013 22:23:15 +0000 (15:23 -0700)]
screenshot layers wouldn't work in some cases

specifically when the display size and the screenshot window
size didn't match, the buffer would be rejected.
We simply fix this by setting the scalling mode to
"SCALE_TO_WINDOW".

Bug: 9992306
Change-Id: Ib821767899af330bb70d3cbbfa7d41b02794a075

10 years agoMerge "dumpstate: Fix wifi list of networks dump" into klp-dev
Dmitry Shmidt [Wed, 21 Aug 2013 19:35:25 +0000 (19:35 +0000)]
Merge "dumpstate: Fix wifi list of networks dump" into klp-dev

10 years agoSurface: Fix controlledByApp parameter
Eino-Ville Talvala [Wed, 21 Aug 2013 18:53:37 +0000 (11:53 -0700)]
Surface: Fix controlledByApp parameter

Bug: 10425641
Change-Id: I1a47e2ce4ecbdb8e67030a5d9ddf6604c5e2497d

10 years agoMerge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev
Mathias Agopian [Wed, 21 Aug 2013 18:55:19 +0000 (18:55 +0000)]
Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev

10 years agodumpstate: Fix wifi list of networks dump
Dmitry Shmidt [Wed, 21 Aug 2013 17:58:29 +0000 (10:58 -0700)]
dumpstate: Fix wifi list of networks dump

Bug: 9056601

Change-Id: Ia0adb67afdf3d478033d0ee34bbb95e621e2fe51
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoMerge "Provide HWC prepare with a valid output buffer" into klp-dev
Jesse Hall [Wed, 21 Aug 2013 14:38:51 +0000 (14:38 +0000)]
Merge "Provide HWC prepare with a valid output buffer" into klp-dev

10 years agoMerge "Fix HWComposer dumping of float source crops" into klp-dev
Jesse Hall [Wed, 21 Aug 2013 14:37:50 +0000 (14:37 +0000)]
Merge "Fix HWComposer dumping of float source crops" into klp-dev

10 years agoMerge "Fix virtual displays for HWC 1.0" into klp-dev
Andy McFadden [Wed, 21 Aug 2013 14:31:34 +0000 (14:31 +0000)]
Merge "Fix virtual displays for HWC 1.0" into klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 21 Aug 2013 13:02:26 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoFix a bug where non-cropped layer could be scaled incorrectly
Mathias Agopian [Wed, 21 Aug 2013 04:41:07 +0000 (21:41 -0700)]
Fix a bug where non-cropped layer could be scaled incorrectly

If a layer is not cropped but its bounds are outside of the
viewport (i.e.: clipped), the crop rectangle passed to
hw composer would be invalid because it started invalid
in the first place (to indicate "no crop").

Bug: 10410944
Change-Id: I4ae4d49a1adef0be7fa4304ecf84b1a5b7d03fe0

10 years agoProvide HWC prepare with a valid output buffer
Jesse Hall [Tue, 20 Aug 2013 23:35:32 +0000 (16:35 -0700)]
Provide HWC prepare with a valid output buffer

We weren't dequeing and setting the output buffer until just before
set(). This didn't allow HWC to make decisions in prepare() based on
the output buffer format, dimensions, etc.

Now we dequeue the output buffer at the beginning of the composition
loop and provide it to HWC in prepare. In GLES-only rendering, we may
have to cancel the buffer and acquire a new one if GLES requests a
buffer with properties different than the one we already dequeued.

Bug: 10365313
Change-Id: I96b4b0a851920e4334ef05080d58097d46467ab8

10 years agoFix HWComposer dumping of float source crops
Jesse Hall [Tue, 20 Aug 2013 23:11:50 +0000 (16:11 -0700)]
Fix HWComposer dumping of float source crops

Change-Id: I45a9344b5fab17ccb54bebd01382d738a03860e6

10 years agoFix virtual displays for HWC 1.0
Andy McFadden [Tue, 20 Aug 2013 23:04:47 +0000 (16:04 -0700)]
Fix virtual displays for HWC 1.0

We weren't swapping the buffers.

Bug 10366404

Change-Id: I43eb7648231bedf24899da6fc0d9acc09e0b047e

10 years agoSurfaceFlinger now runs in the process's main thread
Mathias Agopian [Tue, 20 Aug 2013 00:26:18 +0000 (17:26 -0700)]
SurfaceFlinger now runs in the process's main thread

it used to spawn its own thread and return the main thread
to the binder thread pool -- this was confusing the naming
of things in the kernel.

Bug: 10331839

Change-Id: I2d13a6d73409a38109300fcbe6a04b4c41cb5d00

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 20 Aug 2013 13:01:38 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoFix build
Andy McFadden [Mon, 19 Aug 2013 15:56:07 +0000 (08:56 -0700)]
Fix build

Neglected the "checkbuild"-built tests.

Change-Id: I202692f1a6d1e306c88e820c959d07d16e7c6a00

10 years agoMerge "Re-enable frame dropping for non-auto timestamps" into klp-dev
Andy McFadden [Mon, 19 Aug 2013 14:27:28 +0000 (14:27 +0000)]
Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 19 Aug 2013 13:01:39 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoMerge "Use new HWC display type/count constants." into klp-dev
Jesse Hall [Sun, 18 Aug 2013 04:31:24 +0000 (04:31 +0000)]
Merge "Use new HWC display type/count constants." into klp-dev

10 years agoMerge "Encapsulate textures into their own Texture class" into klp-dev
Mathias Agopian [Sat, 17 Aug 2013 00:40:19 +0000 (00:40 +0000)]
Merge "Encapsulate textures into their own Texture class" into klp-dev

10 years agoEncapsulate textures into their own Texture class
Mathias Agopian [Thu, 15 Aug 2013 01:20:17 +0000 (18:20 -0700)]
Encapsulate textures into their own Texture class

the main reason for doing this is so that we can have
access to informations about a texture (like its dimension)
close to where we generate and use shaders in ES 2.0.
Previously, there wasn't any way to get to a texture's size
from a RenderEngine implementation.

Bug: 8679321

Change-Id: I388b338a70d07e3e8177dde248710ea1e4c82dff

10 years agoRe-enable frame dropping for non-auto timestamps
Andy McFadden [Fri, 16 Aug 2013 21:55:39 +0000 (14:55 -0700)]
Re-enable frame dropping for non-auto timestamps

This change adds an entire field to note whether the timestamp was
auto-generated by Surface or supplied by the application.

The value is used when deciding whether or not to drop frames based
on buffer presentation timestamps.  If a desired presentation time
was set explicitly, BufferQueue will use that value to decide if a
frame should be dropped.  If the timestamp was generated by Surface
at the time the buffer was queued, the timestamp is ignored.

Bug 10151804

Change-Id: Ibd571a7578351063b813cbdad2ddbeed70655ba5

10 years agoMerge "Replace sRGB_888 with sRGB_X_8888" into klp-dev
Jesse Hall [Fri, 16 Aug 2013 21:50:22 +0000 (21:50 +0000)]
Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev

10 years agoUse new HWC display type/count constants.
Jesse Hall [Fri, 16 Aug 2013 21:28:37 +0000 (14:28 -0700)]
Use new HWC display type/count constants.

Change-Id: I774d0c68906ac6dc69268f708c30a6b0868b8816

10 years agoMerge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquire...
Igor Murashkin [Fri, 16 Aug 2013 21:02:01 +0000 (21:02 +0000)]
Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev

10 years agoReplace sRGB_888 with sRGB_X_8888
Jesse Hall [Fri, 16 Aug 2013 14:50:11 +0000 (07:50 -0700)]
Replace sRGB_888 with sRGB_X_8888

Bug: 10357459
Change-Id: I3a1d92cce2c9d3e930408129fb20887276fffddc

10 years agoMerge "Add support for EGL_KHR_gl_colorspace" into klp-dev
Jesse Hall [Thu, 15 Aug 2013 23:17:49 +0000 (23:17 +0000)]
Merge "Add support for EGL_KHR_gl_colorspace" into klp-dev

10 years agoMerge "Fix ES2 composition on some devices" into klp-dev
Mathias Agopian [Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)]
Merge "Fix ES2 composition on some devices" into klp-dev

10 years agoSimplify handling of opaque layers in shader generation
Mathias Agopian [Wed, 14 Aug 2013 23:33:27 +0000 (16:33 -0700)]
Simplify handling of opaque layers in shader generation

just ensure the alpha value is 1.0 in the opaque case
when reading the color from the texture or the
global color.

Bug: 8679321

Change-Id: Ia38b30e97c3bce5a2d534a40c0d66e0bfc3ea40d

10 years agoFix ES2 composition on some devices
Mathias Agopian [Thu, 15 Aug 2013 21:56:51 +0000 (14:56 -0700)]
Fix ES2 composition on some devices

- turns out fragment shaders don't have default precision by default
- GLES 1.x extensions that became core in GLES 2.0 don't always work
  as extensions in GLES 2.0 (!)

Bug: 8679321
Change-Id: I5a4a93e158247910399325a965af5d2e3bbece9b

10 years agoDisable GLES 2.x rendering
Andy McFadden [Thu, 15 Aug 2013 17:39:11 +0000 (10:39 -0700)]
Disable GLES 2.x rendering

Bug 10340705

Change-Id: I91f3baf0d79655d8d031c100d0b116f745c2fbef

10 years agoInitialize mIndent
Andy McFadden [Thu, 15 Aug 2013 17:05:01 +0000 (10:05 -0700)]
Initialize mIndent

Bug 10334731

Change-Id: Ia3aa118a1516cc480b0d85179b78c4447f982dd6

10 years agoDisable GLES 2.x rendering
Andy McFadden [Thu, 15 Aug 2013 17:39:11 +0000 (10:39 -0700)]
Disable GLES 2.x rendering

Bug 10340705

Change-Id: I91f3baf0d79655d8d031c100d0b116f745c2fbef

10 years agoInitialize mIndent
Andy McFadden [Thu, 15 Aug 2013 17:05:01 +0000 (10:05 -0700)]
Initialize mIndent

Bug 10334731

Change-Id: Ia3aa118a1516cc480b0d85179b78c4447f982dd6

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 15 Aug 2013 13:01:06 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev

10 years agogui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired
Igor Murashkin [Thu, 15 Aug 2013 01:49:12 +0000 (18:49 -0700)]
gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired

- Return NOT_ENOUGH_DATA instead of INVALID_OPERATION when too many
  buffers have already been locked.
- INVALID_OPERATION is nominally used when something irrecoverable happens,
  but in this case the client just needs to call unlockBuffer to go back into a
  good state.

Bug: 10333400
Change-Id: I3a034d77de85741429f832a90eedd670afa1dc94

10 years agofix build. optional test broke.
Mathias Agopian [Thu, 15 Aug 2013 01:22:02 +0000 (18:22 -0700)]
fix build. optional test broke.

Change-Id: I0ed5e2cd4c8945ee95673ed0eec5820d9def5097

10 years agoFix build. optional tests were broken.
Mathias Agopian [Wed, 14 Aug 2013 23:26:43 +0000 (16:26 -0700)]
Fix build. optional tests were broken.

Change-Id: Iba9f5cb57f134559e1f9c55e293578d9f5d8cb96

10 years agoMerge "don't reallocate the mesh each time we use it" into klp-dev
Mathias Agopian [Wed, 14 Aug 2013 22:43:25 +0000 (22:43 +0000)]
Merge "don't reallocate the mesh each time we use it" into klp-dev