OSDN Git Service

android-x86/device-generic-goldfish.git
8 years agorild: setup rild library path in init.<board>.rc file.
David 'Digit' Turner [Wed, 22 Jun 2016 10:00:41 +0000 (12:00 +0200)]
rild: setup rild library path in init.<board>.rc file.

This allows us to remove emulator-specific hacks in
hardware/ril/rild/rild.c

BUG=25875346

Change-Id: I3b40c19bf6da3eb0bcd3398179d61d363b29941d

8 years agoMerge "vibrator: Remove qemu dependency."
David Turner [Wed, 22 Jun 2016 08:10:07 +0000 (08:10 +0000)]
Merge "vibrator: Remove qemu dependency."

8 years agovibrator: Remove qemu dependency.
David 'Digit' Turner [Tue, 21 Jun 2016 11:23:35 +0000 (13:23 +0200)]
vibrator: Remove qemu dependency.

Remove dependency on the obsolete qemu functions for
libhardware_legacy which are going to be removed by
a future patch. Use the <system/qemu_pipe.h> interface
directly instead.

BUG=25875346

Change-Id: I7d6db640e1afca3e83d1b53e6e2460fbf58a5615

8 years agoMerge "Use new <system/qemu_pipe.h> header."
David Turner [Tue, 21 Jun 2016 07:38:01 +0000 (07:38 +0000)]
Merge "Use new <system/qemu_pipe.h> header."

8 years agoUse new <system/qemu_pipe.h> header.
David 'Digit' Turner [Thu, 16 Jun 2016 16:55:11 +0000 (18:55 +0200)]
Use new <system/qemu_pipe.h> header.

Also also remove misc. compiler warnings about unused
parameters or mismatched function pointer types.

BUG=25875346

Change-Id: I763267e2b670730e194dc361ce356e10b6aa8180

8 years agoMerge changes I6badcc6a,I652ac746
David Turner [Fri, 17 Jun 2016 07:47:57 +0000 (07:47 +0000)]
Merge changes I6badcc6a,I652ac746

* changes:
  rild: Remove support for host-specific radio device.
  Remove obsolete 'qemud' service.

8 years agorild: Remove support for host-specific radio device.
David 'Digit' Turner [Wed, 15 Jun 2016 15:34:35 +0000 (17:34 +0200)]
rild: Remove support for host-specific radio device.

The android.qemud kernel parameter was used before this patch
in the following way:

  - If defined (e.g. to '1'), then enable the RIL daemon
    to control networking.

  - If undefined, and android.rild is defined, then use
    this device to communicate with a host-side GSM modem
    connected to the emulator (using the -radio <chardev>
    option). Since this feature is now deprecated / obsolete
    there is no need to support it anymore.

  - If both parameters are undefined, use the Java-based
    emulated telephony stack provided by the framework
    itself. The latter was never supported by the emulator
    so has never been tested.

This patch removes all the tests to always enable the RIL
daemon, simplifying the script.

Change-Id: I6badcc6aa34f595e4c76c97e4b8a1a0348650fc1

8 years agoRemove obsolete 'qemud' service.
David 'Digit' Turner [Wed, 15 Jun 2016 15:32:25 +0000 (17:32 +0200)]
Remove obsolete 'qemud' service.

The qemud service was a small daemon used to implement
a multiplexing communication channel over a tty between
guest processes and the emulator. It has been replaced
by the QEMU pipe device since at least API level 14, and
is thus not needed anymore.

This patch removes it from the system build.

IMPORTANT NOTE:
    Many of the sources include <hardware/qemud.h>, currently
    provided by hardware/libhware/include/, but this header
    uses the pipe directly to connect to the emulator. Such
    code is thus unaffected by this patch.

Change-Id: I652ac746f1d17f8b2cced2782269013f768e3739

8 years agoMerge "Fix const issues in preparation for libcxx rebase."
Dan Austin [Wed, 25 May 2016 20:40:19 +0000 (20:40 +0000)]
Merge "Fix const issues in preparation for libcxx rebase."

8 years agoFix const issues in preparation for libcxx rebase.
Dan Austin [Wed, 25 May 2016 19:46:28 +0000 (12:46 -0700)]
Fix const issues in preparation for libcxx rebase.

Change-Id: I2a939c87af3ef9881d9c806ba374185bd31a4954

8 years agoMerge "Build camera related goldfish HALs as brilloemulator for Brillo"
Christopher Wiley [Fri, 19 Feb 2016 19:42:01 +0000 (19:42 +0000)]
Merge "Build camera related goldfish HALs as brilloemulator for Brillo"

8 years agoBuild camera related goldfish HALs as brilloemulator for Brillo
Christopher Wiley [Fri, 12 Feb 2016 20:37:09 +0000 (12:37 -0800)]
Build camera related goldfish HALs as brilloemulator for Brillo

Brillo runs a reduced subset of the graphics stack and a different
system configuration from goldfish.  However, many of these HALs still
make sense for Brillo.  Build the HALs with a board name that will allow
the camera and graphics subsystems to pick them up.

Bug: 26936651
Test: brilloemulator is able to pick up and use these HALs to take
      fake pictures.

Change-Id: I79265ada33a5a97c6f670b79f9c239606465c9fc

8 years agoMerge "Support generic buffers in EmulatedFakeCamera3"
Christopher Wiley [Tue, 16 Feb 2016 19:41:37 +0000 (19:41 +0000)]
Merge "Support generic buffers in EmulatedFakeCamera3"

8 years agoMerge "Refactor gralloc HAL to not repeat defintions"
Christopher Wiley [Tue, 16 Feb 2016 17:24:46 +0000 (17:24 +0000)]
Merge "Refactor gralloc HAL to not repeat defintions"

8 years agoSupport generic buffers in EmulatedFakeCamera3
Christopher Wiley [Fri, 12 Feb 2016 19:40:27 +0000 (11:40 -0800)]
Support generic buffers in EmulatedFakeCamera3

When we're using a gralloc HAL other than the goldfish version (e.g.
gralloc.default, which gralloc.goldfish will fall back on), we
are not given cb_handle_t.  Check for this and fall back appropriately.

Bug: 26936651
Test: brilloemulator stops complaining about a format of 0.

Change-Id: I7a84c775ee6c49e23c82afb8f8b1f490505a55c5

8 years agoRefactor gralloc HAL to not repeat defintions
Christopher Wiley [Fri, 12 Feb 2016 20:32:07 +0000 (12:32 -0800)]
Refactor gralloc HAL to not repeat defintions

Bug: 26936651
Change-Id: If11a2af0496cdaf86e3bc87ded37fc8d93b7fa16

8 years agoam c1d796f4: am ef6c1c57: Merge changes Ie449043b,I0c08e8cd
David Turner [Fri, 25 Sep 2015 14:38:51 +0000 (14:38 +0000)]
am c1d796f4: am ef6c1c57: Merge changes Ie449043b,I0c08e8cd

* commit 'c1d796f44ae74a629f4d6d5d487bdf028d3d2eb2':
  GPU: Build gralloc.ranchu.so
  init.ranchu.rc: enable qemu-props & use GPU emulation if available

8 years agoam ef6c1c57: Merge changes Ie449043b,I0c08e8cd
David Turner [Fri, 25 Sep 2015 14:31:12 +0000 (14:31 +0000)]
am ef6c1c57: Merge changes Ie449043b,I0c08e8cd

* commit 'ef6c1c57263dfcc8c577fda5fb6293b3f9899612':
  GPU: Build gralloc.ranchu.so
  init.ranchu.rc: enable qemu-props & use GPU emulation if available

8 years agoMerge changes Ie449043b,I0c08e8cd
David Turner [Fri, 25 Sep 2015 14:27:01 +0000 (14:27 +0000)]
Merge changes Ie449043b,I0c08e8cd

* changes:
  GPU: Build gralloc.ranchu.so
  init.ranchu.rc: enable qemu-props & use GPU emulation if available

8 years agoGPU: Build gralloc.ranchu.so
Miroslav Tisma [Wed, 23 Sep 2015 10:54:56 +0000 (12:54 +0200)]
GPU: Build gralloc.ranchu.so

Change-Id: Ie449043b06b6fefa52bdbd68c243a1165ec95ee1

8 years agoinit.ranchu.rc: enable qemu-props & use GPU emulation if available
Miroslav Tisma [Wed, 23 Sep 2015 16:32:27 +0000 (18:32 +0200)]
init.ranchu.rc: enable qemu-props & use GPU emulation if available

Change-Id: I0c08e8cd76cf7da19447f34de08bd7a1f1cd21ba

8 years agoam f20cca78: am 948dfb6e: emulator-fingerprint: Exit listener thread on HAL close
bohu [Thu, 17 Sep 2015 18:33:48 +0000 (18:33 +0000)]
am f20cca78: am 948dfb6e: emulator-fingerprint: Exit listener thread on HAL close

* commit 'f20cca78fc06398de0701d0c5bba589c0fe2f738':
  emulator-fingerprint: Exit listener thread on HAL close

8 years agoam 948dfb6e: emulator-fingerprint: Exit listener thread on HAL close
bohu [Thu, 17 Sep 2015 18:13:40 +0000 (18:13 +0000)]
am 948dfb6e: emulator-fingerprint: Exit listener thread on HAL close

* commit '948dfb6e500f11106f68671d77f85bb633e678ce':
  emulator-fingerprint: Exit listener thread on HAL close

8 years agoresolved conflicts for a36a210b to mnc-dr-dev-plus-aosp
Vince Harron [Thu, 17 Sep 2015 02:26:36 +0000 (19:26 -0700)]
resolved conflicts for a36a210b to mnc-dr-dev-plus-aosp

8 years agoemulator-fingerprint: Exit listener thread on HAL close
bohu [Wed, 16 Sep 2015 22:52:03 +0000 (15:52 -0700)]
emulator-fingerprint: Exit listener thread on HAL close

Note: This CL comes from Yu Ning <yu.ning@intel.com>

The current fingerprint HAL module for the emulator cannot be closed,
because fingerprint_close() always gets stuck waiting for the listener
thread to finish execution. Meanwhile, the listener thread is blocked on
qemud_channel_recv(), which does not return unless the host (QEMU) sends
something through the qemud channel.

This leads to the following bug:

https://code.google.com/p/android/issues/detail?id=186174

It is worth noting, though, that fingerprint_close() does try to unblock
qemud_channel_recv() by asynchronously closing the qemud channel, which
is backed by goldfish pipe. Unfortunately, that does not work, probably
because goldfish pipe does not automatically make pending I/O operations
return after closing a channel.

Any proper solution should probably poll the qemud channel before the
call to qemud_channel_recv(), and make sure the polling can be canceled,
allowing the listener thread to terminate gracefully.

Setting a timeout for poll() is straightforward to implement. Another
(slightly better) mechanism that enables instant interruption of the
polling of the qemud channel has also been implemented and tested, but
is more complicated and would add 200+ lines to fingerprint.c.

Therefore, take the simple, timeout-based approach for now, and maybe
revisit this issue in the future.

Change-Id: I02aa1f631d4ee651fe1ac7fb338076beaedddc40

8 years agoam 3ea472d4: init.ranchu.rc: Add dhcpcd_eth0 service
Miroslav Tisma [Wed, 16 Sep 2015 22:01:08 +0000 (22:01 +0000)]
am 3ea472d4: init.ranchu.rc: Add dhcpcd_eth0 service

* commit '3ea472d45910dc4758dde13fde86e0ef87804f0f':
  init.ranchu.rc: Add dhcpcd_eth0 service

8 years agoinit.ranchu.rc: Add dhcpcd_eth0 service
Miroslav Tisma [Thu, 4 Jun 2015 13:23:19 +0000 (15:23 +0200)]
init.ranchu.rc: Add dhcpcd_eth0 service

This commit adds dhcpcd service for eth interface which enables
netwoking in the ranchu emulators. Since rild support is not
implemented yet in ranchu version, this is a working solution
for enabling the internet support.

bug: 24070972

(cherry-picked from aosp: 0668c61a8bc91f223c01ba8c9db11daff31b0fc0)

Change-Id: Icdc2ef8c7beec228d3ef54baa1da9319588ebb36

8 years agoam e0516191: am f510c6b6: am 36c9629a: Merge "Fix glActiveTexture invalid parameter...
Bo Hu [Fri, 11 Sep 2015 23:19:42 +0000 (23:19 +0000)]
am e0516191: am f510c6b6: am 36c9629a: Merge "Fix glActiveTexture invalid parameter bug"

* commit 'e0516191eb7ea9ed8705bb815c523d7f7a54774c':
  Fix glActiveTexture invalid parameter bug

8 years agoam c2ce4a0a: am d7240203: am 9efa06df: Merge "Add validation check for glUniform...
Bo Hu [Fri, 11 Sep 2015 23:19:42 +0000 (23:19 +0000)]
am c2ce4a0a: am d7240203: am 9efa06df: Merge "Add validation check for glUniform* APIs"

* commit 'c2ce4a0a768ed01341a392b292cacfb5b1d9d8d7':
  Add validation check for glUniform* APIs

8 years agoam f510c6b6: am 36c9629a: Merge "Fix glActiveTexture invalid parameter bug"
Bo Hu [Fri, 11 Sep 2015 23:05:33 +0000 (23:05 +0000)]
am f510c6b6: am 36c9629a: Merge "Fix glActiveTexture invalid parameter bug"

* commit 'f510c6b65190bae1980c76f83897951c6665ec4a':
  Fix glActiveTexture invalid parameter bug

8 years agoam d7240203: am 9efa06df: Merge "Add validation check for glUniform* APIs"
Bo Hu [Fri, 11 Sep 2015 23:05:32 +0000 (23:05 +0000)]
am d7240203: am 9efa06df: Merge "Add validation check for glUniform* APIs"

* commit 'd7240203f87917d54e93ce95c8ebe33b3be8c842':
  Add validation check for glUniform* APIs

8 years agoam 36c9629a: Merge "Fix glActiveTexture invalid parameter bug"
Bo Hu [Fri, 11 Sep 2015 22:14:41 +0000 (22:14 +0000)]
am 36c9629a: Merge "Fix glActiveTexture invalid parameter bug"

* commit '36c9629adb8e71d4ba5afdbce67c67f03ba76668':
  Fix glActiveTexture invalid parameter bug

8 years agoam 9efa06df: Merge "Add validation check for glUniform* APIs"
Bo Hu [Fri, 11 Sep 2015 22:14:40 +0000 (22:14 +0000)]
am 9efa06df: Merge "Add validation check for glUniform* APIs"

* commit '9efa06dfba71f7e01b5816cf31a4016fe8e80a3d':
  Add validation check for glUniform* APIs

8 years agoMerge "Fix glActiveTexture invalid parameter bug"
Bo Hu [Fri, 11 Sep 2015 21:44:26 +0000 (21:44 +0000)]
Merge "Fix glActiveTexture invalid parameter bug"

8 years agoMerge "Add validation check for glUniform* APIs"
Bo Hu [Fri, 11 Sep 2015 21:42:57 +0000 (21:42 +0000)]
Merge "Add validation check for glUniform* APIs"

8 years agoFix glActiveTexture invalid parameter bug
Tina Zhang [Tue, 8 Sep 2015 05:59:28 +0000 (13:59 +0800)]
Fix glActiveTexture invalid parameter bug

The parameter texture must be one of GL_TEXTUREi, where i
ranges from zero to the value of GL_MAX_COMBINED_TEXTURE_
IMAGE_UNITS minus one.

Change-Id: I98e0801eb25ebb449615cf0bb4ff6244f6ac9a0f
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
8 years agoam b7964f45: am 5ff9e329: Merge commit \'b82a006cf7db1d3790272279eeaa066827d5bf81...
Jim Kaye [Fri, 11 Sep 2015 03:49:56 +0000 (03:49 +0000)]
am b7964f45: am 5ff9e329: Merge commit \'b82a006cf7db1d3790272279eeaa066827d5bf81\' into gf-merge

* commit 'b7964f45e0b35befb77bf0ab0896827f3cc14fd1':
  Support removing a fingerprint

8 years agoAdd validation check for glUniform* APIs
Tina Zhang [Mon, 7 Sep 2015 04:31:35 +0000 (12:31 +0800)]
Add validation check for glUniform* APIs

Add validation check for glUniform* APIs to pass the
dEQP tests.

Change-Id: Ide31890d8986ea2773f451d6681298bb93163ae6
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Signed-off-by: Lizhe Liu <lizhe.liu@intel.com>
8 years agoam 5ff9e329: Merge commit \'b82a006cf7db1d3790272279eeaa066827d5bf81\' into gf-merge
Jim Kaye [Fri, 11 Sep 2015 00:43:43 +0000 (00:43 +0000)]
am 5ff9e329: Merge commit \'b82a006cf7db1d3790272279eeaa066827d5bf81\' into gf-merge

* commit '5ff9e3298ed844aaac2a54608b36ed56f7f09319':
  Support removing a fingerprint

8 years agoMerge commit 'b82a006cf7db1d3790272279eeaa066827d5bf81' into gf-merge
Jim Kaye [Thu, 10 Sep 2015 23:53:21 +0000 (16:53 -0700)]
Merge commit 'b82a006cf7db1d3790272279eeaa066827d5bf81' into gf-merge

Primarily pick up the additional comments/descriptions that were
in parallel.

Change-Id: I164986a39d9c9c4cccaec165f011e3c1fe930128

8 years agoMerge "Support removing a fingerprint" into mnc-dev
Jim Kaye [Thu, 10 Sep 2015 21:32:31 +0000 (21:32 +0000)]
Merge "Support removing a fingerprint" into mnc-dev

8 years agoSupport removing a fingerprint
Jim Kaye [Tue, 8 Sep 2015 20:47:09 +0000 (13:47 -0700)]
Support removing a fingerprint

Support deleting a fingerprint based on ID rather than table index.
When deleting an entry, or deleting multiple entries via "delete all,"
send a notification of each ID that was deleted.

Change-Id: Ifd79f659fa6246ab3fecd86ee59a887b359e6168

8 years agoam f1e21e8c: am eb7cbfd0: am b83024c5: Merge "Delete some useless files"
David Turner [Wed, 9 Sep 2015 14:02:43 +0000 (14:02 +0000)]
am f1e21e8c: am eb7cbfd0: am b83024c5: Merge "Delete some useless files"

* commit 'f1e21e8c8416b3dad82f193cadefe65276aaab96':
  Delete some useless files

8 years agoam eb7cbfd0: am b83024c5: Merge "Delete some useless files"
David Turner [Wed, 9 Sep 2015 13:55:14 +0000 (13:55 +0000)]
am eb7cbfd0: am b83024c5: Merge "Delete some useless files"

* commit 'eb7cbfd0e2ee5c1bf3633b596caf0d312bdb49db':
  Delete some useless files

8 years agoam b83024c5: Merge "Delete some useless files"
David Turner [Wed, 9 Sep 2015 13:45:41 +0000 (13:45 +0000)]
am b83024c5: Merge "Delete some useless files"

* commit 'b83024c5f883d1270d86f780900ecdf56bfe83f0':
  Delete some useless files

8 years agoMerge "Delete some useless files"
David Turner [Wed, 9 Sep 2015 13:41:55 +0000 (13:41 +0000)]
Merge "Delete some useless files"

8 years agoam a6e3573c: am c4e380db: am 5ce6cd31: Merge "Fix glDrawArrays API issue"
Bo Hu [Wed, 9 Sep 2015 01:04:42 +0000 (01:04 +0000)]
am a6e3573c: am c4e380db: am 5ce6cd31: Merge "Fix glDrawArrays API issue"

* commit 'a6e3573c456dfaa6bf441b29a8723ae592d55624':
  Fix glDrawArrays API issue

8 years agoam c4e380db: am 5ce6cd31: Merge "Fix glDrawArrays API issue"
Bo Hu [Wed, 9 Sep 2015 00:45:38 +0000 (00:45 +0000)]
am c4e380db: am 5ce6cd31: Merge "Fix glDrawArrays API issue"

* commit 'c4e380db2f73019f928b417bb85ee851c088b9fb':
  Fix glDrawArrays API issue

8 years agoam 5ce6cd31: Merge "Fix glDrawArrays API issue"
Bo Hu [Wed, 9 Sep 2015 00:38:45 +0000 (00:38 +0000)]
am 5ce6cd31: Merge "Fix glDrawArrays API issue"

* commit '5ce6cd3192de65994909bb43f3ac7dd6bd73f437':
  Fix glDrawArrays API issue

8 years agoMerge "Fix glDrawArrays API issue"
Bo Hu [Wed, 9 Sep 2015 00:28:03 +0000 (00:28 +0000)]
Merge "Fix glDrawArrays API issue"

8 years agoam 29e4e33d: am 82f9ec59: am 00c1f48e: Removes overriding value of EXTERNAL_STORAGE...
Evan Birenbaum [Tue, 8 Sep 2015 23:39:19 +0000 (23:39 +0000)]
am 29e4e33d: am 82f9ec59: am 00c1f48e: Removes overriding value of EXTERNAL_STORAGE for arm64.

* commit '29e4e33dcf1d0e2d5e06f2b3ab8bfff4b9d41423':
  Removes overriding value of EXTERNAL_STORAGE for arm64.

8 years agoam af3bcb87: am c336ddfb: Add some guidance documentation to the emulator
Jim Miller [Tue, 8 Sep 2015 23:39:18 +0000 (23:39 +0000)]
am af3bcb87: am c336ddfb: Add some guidance documentation to the emulator

* commit 'af3bcb87bffff871ea659cb09c5746a681796c28':
  Add some guidance documentation to the emulator

8 years agoam 82f9ec59: am 00c1f48e: Removes overriding value of EXTERNAL_STORAGE for arm64.
Evan Birenbaum [Tue, 8 Sep 2015 23:33:10 +0000 (23:33 +0000)]
am 82f9ec59: am 00c1f48e: Removes overriding value of EXTERNAL_STORAGE for arm64.

* commit '82f9ec5920daa3430fad54a17400acaa47329f71':
  Removes overriding value of EXTERNAL_STORAGE for arm64.

8 years agoam c336ddfb: Add some guidance documentation to the emulator
Jim Miller [Tue, 8 Sep 2015 23:33:10 +0000 (23:33 +0000)]
am c336ddfb: Add some guidance documentation to the emulator

* commit 'c336ddfb0d857df378cf543a0591e8a6501f88c4':
  Add some guidance documentation to the emulator

8 years agoam 00c1f48e: Removes overriding value of EXTERNAL_STORAGE for arm64.
Evan Birenbaum [Tue, 8 Sep 2015 23:12:06 +0000 (23:12 +0000)]
am 00c1f48e: Removes overriding value of EXTERNAL_STORAGE for arm64.

* commit '00c1f48e2afff6a0a605290d5fd893a63a700a7a':
  Removes overriding value of EXTERNAL_STORAGE for arm64.

8 years agoRemoves overriding value of EXTERNAL_STORAGE for arm64.
Evan Birenbaum [Fri, 4 Sep 2015 22:50:25 +0000 (15:50 -0700)]
Removes overriding value of EXTERNAL_STORAGE for arm64.

Bug: 23327332
Change-Id: I29bd8fb0d6d631f360eff471bae9ba3f055a2b6c

8 years agoFix glDrawArrays API issue
Lizhe Liu [Mon, 7 Sep 2015 03:37:59 +0000 (11:37 +0800)]
Fix glDrawArrays API issue

Like glDrawElements function, glDrawArrays also need check
some parameters in guest OS. In that way, if drivers in host
OS do not have enough support, we can also handle the ERROR
state.

Signed-off-by: Lizhe Liu <lizhe.liu@intel.com>
Change-Id: If668868b567fe3fe3cc76c88a6c8a6b1aa681fa8

8 years agoDelete some useless files
Tina Zhang [Mon, 7 Sep 2015 02:47:07 +0000 (10:47 +0800)]
Delete some useless files

Currently, some files are not used by the guest part of
GL emulation any more.

Change-Id: I1fb87614aaba19be6863d6fb85e80937d0778384
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
9 years agoam 44a71b13: am b1abfa1a: am 3682b601: Merge "Adds check for argument ‘level’ in...
Bo Hu [Wed, 2 Sep 2015 17:49:12 +0000 (17:49 +0000)]
am 44a71b13: am b1abfa1a: am 3682b601: Merge "Adds check for argument â€˜level’ in glTexSubImage2D."

* commit '44a71b139ab72877550219c944c54e9d489acc45':
  Adds check for argument â€˜level’ in glTexSubImage2D.

9 years agoam b1abfa1a: am 3682b601: Merge "Adds check for argument ‘level’ in glTexSubImage2D."
Bo Hu [Wed, 2 Sep 2015 17:43:09 +0000 (17:43 +0000)]
am b1abfa1a: am 3682b601: Merge "Adds check for argument â€˜level’ in glTexSubImage2D."

* commit 'b1abfa1a6e156158d66ab1be830b13508dd15817':
  Adds check for argument â€˜level’ in glTexSubImage2D.

9 years agoam 3682b601: Merge "Adds check for argument ‘level’ in glTexSubImage2D."
Bo Hu [Wed, 2 Sep 2015 17:33:03 +0000 (17:33 +0000)]
am 3682b601: Merge "Adds check for argument â€˜level’ in glTexSubImage2D."

* commit '3682b601a7a89aa4bbcdf25e122474e10fe0b96a':
  Adds check for argument â€˜level’ in glTexSubImage2D.

9 years agoMerge "Adds check for argument ‘level’ in glTexSubImage2D."
Bo Hu [Wed, 2 Sep 2015 17:22:50 +0000 (17:22 +0000)]
Merge "Adds check for argument â€˜level’ in glTexSubImage2D."

9 years agoam cd44ba9a: am cf6cb07b: am 8b993bd2: Merge "Fix glDrawElements API issue"
Bo Hu [Wed, 2 Sep 2015 02:35:11 +0000 (02:35 +0000)]
am cd44ba9a: am cf6cb07b: am 8b993bd2: Merge "Fix glDrawElements API issue"

* commit 'cd44ba9a1908ecd86d543ab39a61a364981f1a7d':
  Fix glDrawElements API issue

9 years agoam cf6cb07b: am 8b993bd2: Merge "Fix glDrawElements API issue"
Bo Hu [Wed, 2 Sep 2015 02:30:25 +0000 (02:30 +0000)]
am cf6cb07b: am 8b993bd2: Merge "Fix glDrawElements API issue"

* commit 'cf6cb07b69568ea20abaca449679affc29e79ed7':
  Fix glDrawElements API issue

9 years agoam 8b993bd2: Merge "Fix glDrawElements API issue"
Bo Hu [Wed, 2 Sep 2015 02:23:18 +0000 (02:23 +0000)]
am 8b993bd2: Merge "Fix glDrawElements API issue"

* commit '8b993bd256078d9a2d65647d6958d247a99ebfd5':
  Fix glDrawElements API issue

9 years agoMerge "Fix glDrawElements API issue"
Bo Hu [Wed, 2 Sep 2015 02:15:20 +0000 (02:15 +0000)]
Merge "Fix glDrawElements API issue"

9 years agoam 947657e7: am e87277da: am 50f29dfd: Merge "opengl: GLEncoder: Fix potential array...
Bo Hu [Wed, 2 Sep 2015 01:27:51 +0000 (01:27 +0000)]
am 947657e7: am e87277da: am 50f29dfd: Merge "opengl: GLEncoder: Fix potential array buffer misbinding"

* commit '947657e744a3cf7d4889820342350fa76e790ec2':
  opengl: GLEncoder: Fix potential array buffer misbinding

9 years agoam e87277da: am 50f29dfd: Merge "opengl: GLEncoder: Fix potential array buffer misbin...
Bo Hu [Wed, 2 Sep 2015 01:19:07 +0000 (01:19 +0000)]
am e87277da: am 50f29dfd: Merge "opengl: GLEncoder: Fix potential array buffer misbinding"

* commit 'e87277dab17373b129fa126b217a9d858c923071':
  opengl: GLEncoder: Fix potential array buffer misbinding

9 years agoam 50f29dfd: Merge "opengl: GLEncoder: Fix potential array buffer misbinding"
Bo Hu [Wed, 2 Sep 2015 01:10:52 +0000 (01:10 +0000)]
am 50f29dfd: Merge "opengl: GLEncoder: Fix potential array buffer misbinding"

* commit '50f29dfd589be0cbf1e8c3dd0e939349009e1b6a':
  opengl: GLEncoder: Fix potential array buffer misbinding

9 years agoMerge "opengl: GLEncoder: Fix potential array buffer misbinding"
Bo Hu [Wed, 2 Sep 2015 01:03:26 +0000 (01:03 +0000)]
Merge "opengl: GLEncoder: Fix potential array buffer misbinding"

9 years agoam 4d6b0b7a: am a6ebf94c: (-s ours) am 4a91c438: Camera: Fix poseRotation quaternion
Eino-Ville Talvala [Thu, 27 Aug 2015 21:38:16 +0000 (21:38 +0000)]
am 4d6b0b7a: am a6ebf94c: (-s ours) am 4a91c438: Camera: Fix poseRotation quaternion

* commit '4d6b0b7a22a336f53e2ca04c826e17af857a492f':

9 years agoam 2d248512: am 7ee6c8a1: (-s ours) am 9588e751: Merge "Read the size of a window...
Pascal Muetschard [Thu, 27 Aug 2015 21:38:15 +0000 (21:38 +0000)]
am 2d248512: am 7ee6c8a1: (-s ours) am 9588e751: Merge "Read the size of a window surface from the native buffer."

* commit '2d248512b147ed0d9b13d1a52b866a994b48812b':

9 years agoam 990a5663: am 646255ac: (-s ours) am 9cbadbe3: Merge "Implement a couple more surfa...
Pascal Muetschard [Thu, 27 Aug 2015 21:38:15 +0000 (21:38 +0000)]
am 990a5663: am 646255ac: (-s ours) am 9cbadbe3: Merge "Implement a couple more surface attributes in eglQuerySurface."

* commit '990a566383a1df1ebac338f2fdfcfbb72a0a8073':

9 years agoam dad2b185: am 7332de4e: (-s ours) am 0a6eaa1c: Merge "Correctly set the surface...
Pascal Muetschard [Thu, 27 Aug 2015 21:38:14 +0000 (21:38 +0000)]
am dad2b185: am 7332de4e: (-s ours) am 0a6eaa1c: Merge "Correctly set the surface type upon creation."

* commit 'dad2b185b41500af1d34e27f970b1bf974e10a77':

9 years agoam 6a775ce6: am e487730c: (-s ours) am 17cacd30: Merge "Handle pixel formats with...
Pascal Muetschard [Thu, 27 Aug 2015 21:38:14 +0000 (21:38 +0000)]
am 6a775ce6: am e487730c: (-s ours) am 17cacd30: Merge "Handle pixel formats with 16bit and 32bit color channels."

* commit '6a775ce66642be5d604de950df86b1036ed9ff03':

9 years agoam 5c4330e5: am 0e703dc9: (-s ours) am a2d76fb4: Merge "Fixes interpretation of attri...
Pascal Muetschard [Thu, 27 Aug 2015 21:38:13 +0000 (21:38 +0000)]
am 5c4330e5: am 0e703dc9: (-s ours) am a2d76fb4: Merge "Fixes interpretation of attribute lists in the EGL emulation library."

* commit '5c4330e510b1480a3a23c4b0597915a406da13a1':

9 years agoam 5259d5a9: am 62a830b5: (-s ours) am c52b876f: Camera/gralloc: Add basic capability...
Eino-Ville Talvala [Thu, 27 Aug 2015 21:38:12 +0000 (21:38 +0000)]
am 5259d5a9: am 62a830b5: (-s ours) am c52b876f: Camera/gralloc: Add basic capability handling, support DEPTH

* commit '5259d5a92f7d071198306887887142ef988ef5cd':

9 years agoam bc78c4f1: am a1e5a614: (-s ours) am 36430431: Merge "Lose HAVE_ANDROID_OS in goldf...
Elliott Hughes [Thu, 27 Aug 2015 21:38:12 +0000 (21:38 +0000)]
am bc78c4f1: am a1e5a614: (-s ours) am 36430431: Merge "Lose HAVE_ANDROID_OS in goldfish."

* commit 'bc78c4f110aca1a86f4d4f15833bc13cc30c9bdd':

9 years agoam 7486c7ca: (-s ours) am db1ea597: (-s ours) am 56a713e8: am 7edd1a22: (-s ours...
Yu Ning [Thu, 27 Aug 2015 21:38:11 +0000 (21:38 +0000)]
am 7486c7ca: (-s ours) am db1ea597: (-s ours) am 56a713e8: am 7edd1a22: (-s ours) am 4b7ce097: am 9fe34eba: am 34689229: (-s ours) am 02ef81b4: am 51af59bd: (-s ours) am 3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '7486c7ca15717eee666b3c3a82fcfb96d0efc9fb':

9 years agoam 000ed516: (-s ours) am 2fc1e7a1: (-s ours) am 060548b8: am e3d2c781: (-s ours...
Yu Ning [Thu, 27 Aug 2015 21:38:10 +0000 (21:38 +0000)]
am 000ed516: (-s ours) am 2fc1e7a1: (-s ours) am 060548b8: am e3d2c781: (-s ours) am b3f8cad0: am 280ec983: am b871b1a0: (-s ours) am 3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '000ed5165350de319f0ce5e421a486903123d356':

9 years agoam 06d53478: (-s ours) am 35d0e532: (-s ours) am f59798e3: am d2ddfd29: (-s ours...
Yu Ning [Thu, 27 Aug 2015 21:38:09 +0000 (21:38 +0000)]
am 06d53478: (-s ours) am 35d0e532: (-s ours) am f59798e3: am d2ddfd29: (-s ours) am d88b2e76: am ad5614a1: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '06d53478fa5daed36b040a9c0e9c256e0c5b87e4':

9 years agoam 0fb53f42: (-s ours) am 8af367ec: (-s ours) am 00850ad5: am f378402b: (-s ours...
Yu Ning [Thu, 27 Aug 2015 21:38:09 +0000 (21:38 +0000)]
am 0fb53f42: (-s ours) am 8af367ec: (-s ours) am 00850ad5: am f378402b: (-s ours) am e40e60a6: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '0fb53f425aa88bdfe29ec024e09beb56e6a2b9af':

9 years agoam 0a825a4b: am d7b59f16: (-s ours) am 9e4c8a4e: Merge "Camera: Update emulator camer...
Eino-Ville Talvala [Thu, 27 Aug 2015 21:38:08 +0000 (21:38 +0000)]
am 0a825a4b: am d7b59f16: (-s ours) am 9e4c8a4e: Merge "Camera: Update emulator camera v3 HAL to v3.3, module to v2.3" into mnc-dev

* commit '0a825a4b188743ba74ab90ad67d29aa7a0d91fcc':

9 years agoam 294d0bf9: am 3514abb6: (-s ours) am 150fe17c: Merge "opengl: Fix QemuPipeStream...
Konstantinos Menychtas [Thu, 27 Aug 2015 21:38:07 +0000 (21:38 +0000)]
am 294d0bf9: am 3514abb6: (-s ours) am 150fe17c: Merge "opengl: Fix QemuPipeStream::readFully reading beyond end of buffer" into mnc-dev

* commit '294d0bf9c9e0c066f3f36039fae18f6914fb5704':

9 years agoam ae39526e: am 017a5e87: (-s ours) am 3ba99fb8: Fix for MidiManager bug in emulator
Ricardo Garcia [Thu, 27 Aug 2015 21:38:06 +0000 (21:38 +0000)]
am ae39526e: am 017a5e87: (-s ours) am 3ba99fb8: Fix for MidiManager bug in emulator

* commit 'ae39526e66669a4c0e4681bd251338202d81d932':

9 years agoam 1d4027d0: am 620dd560: (-s ours) am b522187e: Merge "opengl: Fix QemuPipeStream...
David Turner [Thu, 27 Aug 2015 21:38:04 +0000 (21:38 +0000)]
am 1d4027d0: am 620dd560: (-s ours) am b522187e: Merge "opengl: Fix QemuPipeStream::readFully reading beyond end of buffer"

* commit '1d4027d0bd626ffa78af7161940caa85d65f0aa2':

9 years agoam a6ebf94c: (-s ours) am 4a91c438: Camera: Fix poseRotation quaternion
Eino-Ville Talvala [Thu, 27 Aug 2015 10:52:04 +0000 (10:52 +0000)]
am a6ebf94c: (-s ours) am 4a91c438: Camera: Fix poseRotation quaternion

* commit 'a6ebf94c814c1ba9cf8f34e521055a84cf1fd267':

9 years agoam 7ee6c8a1: (-s ours) am 9588e751: Merge "Read the size of a window surface from...
Pascal Muetschard [Thu, 27 Aug 2015 10:52:03 +0000 (10:52 +0000)]
am 7ee6c8a1: (-s ours) am 9588e751: Merge "Read the size of a window surface from the native buffer."

* commit '7ee6c8a11777863ebe24669645700a962357e994':

9 years agoam 646255ac: (-s ours) am 9cbadbe3: Merge "Implement a couple more surface attributes...
Pascal Muetschard [Thu, 27 Aug 2015 10:52:03 +0000 (10:52 +0000)]
am 646255ac: (-s ours) am 9cbadbe3: Merge "Implement a couple more surface attributes in eglQuerySurface."

* commit '646255acfbf1c4328e3ca8c446dbbc98402a10d8':

9 years agoam 7332de4e: (-s ours) am 0a6eaa1c: Merge "Correctly set the surface type upon creation."
Pascal Muetschard [Thu, 27 Aug 2015 10:52:02 +0000 (10:52 +0000)]
am 7332de4e: (-s ours) am 0a6eaa1c: Merge "Correctly set the surface type upon creation."

* commit '7332de4ea0bf0c3293c82be711c60ca94a888743':

9 years agoam e487730c: (-s ours) am 17cacd30: Merge "Handle pixel formats with 16bit and 32bit...
Pascal Muetschard [Thu, 27 Aug 2015 10:52:01 +0000 (10:52 +0000)]
am e487730c: (-s ours) am 17cacd30: Merge "Handle pixel formats with 16bit and 32bit color channels."

* commit 'e487730cdb009196cbfb2bdb7e537505dbbfaf66':

9 years agoam 0e703dc9: (-s ours) am a2d76fb4: Merge "Fixes interpretation of attribute lists...
Pascal Muetschard [Thu, 27 Aug 2015 10:52:01 +0000 (10:52 +0000)]
am 0e703dc9: (-s ours) am a2d76fb4: Merge "Fixes interpretation of attribute lists in the EGL emulation library."

* commit '0e703dc9d3e01ebb5440a90f8c7a0fe84a777156':

9 years agoam 62a830b5: (-s ours) am c52b876f: Camera/gralloc: Add basic capability handling...
Eino-Ville Talvala [Thu, 27 Aug 2015 10:52:00 +0000 (10:52 +0000)]
am 62a830b5: (-s ours) am c52b876f: Camera/gralloc: Add basic capability handling, support DEPTH

* commit '62a830b59d7e2d612b42b4b8378f7cf604295be0':

9 years agoam a1e5a614: (-s ours) am 36430431: Merge "Lose HAVE_ANDROID_OS in goldfish."
Elliott Hughes [Thu, 27 Aug 2015 10:52:00 +0000 (10:52 +0000)]
am a1e5a614: (-s ours) am 36430431: Merge "Lose HAVE_ANDROID_OS in goldfish."

* commit 'a1e5a6146be3ebf7a0c504ddaf4f008f0333974f':

9 years agoam db1ea597: (-s ours) am 56a713e8: am 7edd1a22: (-s ours) am 4b7ce097: am 9fe34eba...
Yu Ning [Thu, 27 Aug 2015 10:51:59 +0000 (10:51 +0000)]
am db1ea597: (-s ours) am 56a713e8: am 7edd1a22: (-s ours) am 4b7ce097: am 9fe34eba: am 34689229: (-s ours) am 02ef81b4: am 51af59bd: (-s ours) am 3840dbf5: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit 'db1ea597a94d9b7a33bb564767284cab8eb1b4a2':

9 years agoam 2fc1e7a1: (-s ours) am 060548b8: am e3d2c781: (-s ours) am b3f8cad0: am 280ec983...
Yu Ning [Thu, 27 Aug 2015 10:51:58 +0000 (10:51 +0000)]
am 2fc1e7a1: (-s ours) am 060548b8: am e3d2c781: (-s ours) am b3f8cad0: am 280ec983: am b871b1a0: (-s ours) am 3f83b3fd: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '2fc1e7a126e49ab09f8519d3ea11e2a155594286':

9 years agoam 35d0e532: (-s ours) am f59798e3: am d2ddfd29: (-s ours) am d88b2e76: am ad5614a1...
Yu Ning [Thu, 27 Aug 2015 10:51:57 +0000 (10:51 +0000)]
am 35d0e532: (-s ours) am f59798e3: am d2ddfd29: (-s ours) am d88b2e76: am ad5614a1: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '35d0e53294b5fc0b463dec669f1c975fcf2b14f0':

9 years agoam 8af367ec: (-s ours) am 00850ad5: am f378402b: (-s ours) am e40e60a6: DO NOT MERGE...
Yu Ning [Thu, 27 Aug 2015 10:51:57 +0000 (10:51 +0000)]
am 8af367ec: (-s ours) am 00850ad5: am f378402b: (-s ours) am e40e60a6: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '8af367ec53ac6a9bdb071c5a2139a7a3289cc8cd':

9 years agoam d7b59f16: (-s ours) am 9e4c8a4e: Merge "Camera: Update emulator camera v3 HAL...
Eino-Ville Talvala [Thu, 27 Aug 2015 10:51:56 +0000 (10:51 +0000)]
am d7b59f16: (-s ours) am 9e4c8a4e: Merge "Camera: Update emulator camera v3 HAL to v3.3, module to v2.3" into mnc-dev

* commit 'd7b59f16076cb8e920162a3906a44f14f4677cb0':

9 years agoam 3514abb6: (-s ours) am 150fe17c: Merge "opengl: Fix QemuPipeStream::readFully...
Konstantinos Menychtas [Thu, 27 Aug 2015 10:51:55 +0000 (10:51 +0000)]
am 3514abb6: (-s ours) am 150fe17c: Merge "opengl: Fix QemuPipeStream::readFully reading beyond end of buffer" into mnc-dev

* commit '3514abb65883679759129223db61c92864248328':