OSDN Git Service
Narayan Kamath [Wed, 4 Jun 2014 14:32:59 +0000 (14:32 +0000)]
Merge "Fix mips build for libbinder."
Narayan Kamath [Wed, 4 Jun 2014 14:04:29 +0000 (15:04 +0100)]
Fix mips build for libbinder.
Mips specific code was using an uninitialized variable.
Change-Id: I445043c76ebfa420b26376ade60f8068b4ea0b11
Mark Salyzyn [Tue, 3 Jun 2014 20:54:48 +0000 (20:54 +0000)]
am
f0a24759: am
a28750ee: Merge "binder: Turn on -Werror"
* commit '
f0a2475905786d5457e7af838ac714acbfdafa4f':
binder: Turn on -Werror
Mark Salyzyn [Tue, 3 Jun 2014 20:48:35 +0000 (20:48 +0000)]
am
a28750ee: Merge "binder: Turn on -Werror"
* commit '
a28750eec38c848230adfeef28725b29cc36a9da':
binder: Turn on -Werror
Mark Salyzyn [Tue, 3 Jun 2014 19:40:00 +0000 (19:40 +0000)]
Merge "binder: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 23:35:57 +0000 (16:35 -0700)]
binder: Turn on -Werror
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
Narayan Kamath [Tue, 3 Jun 2014 13:58:40 +0000 (13:58 +0000)]
am
26063a91: am
f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit '
26063a9155ddd18d858cea7fac7c1ddf71e1bcb7':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
Narayan Kamath [Tue, 3 Jun 2014 13:29:00 +0000 (13:29 +0000)]
am
f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit '
f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
Narayan Kamath [Tue, 3 Jun 2014 10:06:55 +0000 (10:06 +0000)]
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
Mark Salyzyn [Thu, 29 May 2014 19:43:36 +0000 (12:43 -0700)]
binder: rm utils/Debug.h as unutilized
Change-Id: I52eb8b64b71cec7ffd4560e902daf358fda98b4a
Fengwei Yin [Fri, 23 May 2014 21:32:09 +0000 (05:32 +0800)]
x86_64: Align uint64_t/int64_t structure member to 8 bytes
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
Mark Salyzyn [Thu, 29 May 2014 21:09:57 +0000 (21:09 +0000)]
am
ea3f1da9: am
1ce5ecbe: am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
ea3f1da9013b33ecf3f3f8771393c1754a9aec59':
binder: rm utils/Debug.h
Brian Carlstrom [Thu, 29 May 2014 21:09:39 +0000 (21:09 +0000)]
am
823bcce3: am
4ae6a267: am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
823bcce3abf536ee130a50551130d10589547cf4':
Remove dependencies on runtime_libdvm and libdvm.so in general
Mark Salyzyn [Thu, 29 May 2014 21:06:36 +0000 (21:06 +0000)]
am
1ce5ecbe: am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
1ce5ecbe3286380f5ff7ace289369ed006e9b40a':
binder: rm utils/Debug.h
Mark Salyzyn [Thu, 29 May 2014 20:29:32 +0000 (20:29 +0000)]
am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
Mark Salyzyn [Thu, 29 May 2014 20:26:48 +0000 (20:26 +0000)]
Merge "binder: rm utils/Debug.h"
Mark Salyzyn [Thu, 29 May 2014 20:09:22 +0000 (13:09 -0700)]
binder: rm utils/Debug.h
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
Brian Carlstrom [Thu, 29 May 2014 19:43:02 +0000 (19:43 +0000)]
am
4ae6a267: am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
4ae6a26719feb21b7fa1cc5f307b591858a30f26':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:39:48 +0000 (19:39 +0000)]
am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
f3e4fda09106cb93bddea35a2cc7dbd4b2c281e9':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:36:41 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Simon Wilson [Thu, 29 May 2014 17:58:30 +0000 (17:58 +0000)]
am
ad8d25e8: am
90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
* commit '
ad8d25e812d8842298de92657158a0325c42cdbd':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Simon Wilson [Thu, 29 May 2014 17:54:34 +0000 (17:54 +0000)]
am
90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
* commit '
90654afb3aeac78916f2a53fe689a087c0e283c9':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b)
Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198
Brian Carlstrom [Thu, 29 May 2014 16:37:18 +0000 (16:37 +0000)]
am
aefe55f0: Remove dependencies on runtime_libdvm and libdvm.so in general
* commit '
aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b':
Remove dependencies on runtime_libdvm and libdvm.so in general
Simon Wilson [Thu, 29 May 2014 15:49:51 +0000 (08:49 -0700)]
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Since the new TI SGX DDK 1.12 has fixed support for RGBA8888,
the workaround can be reverted. This may help with CTS issues.
Bug:
14995811
This reverts commit
6e79cb81d02984c9f7ac0586078f947c94c56c2a.
Change-Id: Id8160ebe577d7009d2dd5eb4501ec40356a4274d
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
Change-Id: I74b4a3dabf89c6b53bfe688c45d6e1167880fd95
Elliott Hughes [Thu, 29 May 2014 01:08:06 +0000 (01:08 +0000)]
am
e77cb931: am
259c2508: am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
e77cb9317de54ea0041eeef7966b818257158f64':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 01:04:28 +0000 (01:04 +0000)]
am
259c2508: am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 01:02:16 +0000 (01:02 +0000)]
am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
03e2f8fa13a791d744758ec9ffe27f52cab730d0':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 00:59:01 +0000 (00:59 +0000)]
Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
Brian Carlstrom [Wed, 28 May 2014 23:18:49 +0000 (23:18 +0000)]
am
28ec0303: am
e67810fd: am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
28ec03035d61828047f6bbc57be3b71f4c57b7fb':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 23:13:27 +0000 (23:13 +0000)]
am
e67810fd: am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
e67810fd7a00ffa92337c6f3aa6114136ce12613':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:31:43 +0000 (22:31 +0000)]
am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
97a51ad44ae3dcf4976076382923ddcae16233ee':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:41 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
c4ac3124ffb51f13bb4206e9f8452a3712eb09cb)
Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
Brian Carlstrom [Wed, 28 May 2014 21:44:58 +0000 (21:44 +0000)]
am
c4ac3124: Move to dalvik.vm.lib.2 to force default to libart
* commit '
c4ac3124ffb51f13bb4206e9f8452a3712eb09cb':
Move to dalvik.vm.lib.2 to force default to libart
Brigid Smith [Wed, 28 May 2014 21:23:24 +0000 (14:23 -0700)]
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Bug:
15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
Change-Id: Id3892a32848fb22fbf4c2861218b51f68e830b34
Dan Stoza [Wed, 28 May 2014 18:31:39 +0000 (18:31 +0000)]
Merge "SurfaceFlinger: Add sourceCrop to screenshot"
Santos Cordon [Wed, 28 May 2014 18:20:13 +0000 (18:20 +0000)]
am
203fe88e: (-s ours) DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
* commit '
203fe88ed8a47a370d07d69d14db2fb58f5a26ee':
DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
The Android Automerger [Wed, 28 May 2014 18:20:13 +0000 (18:20 +0000)]
am
cfe99e79: merge in master-release history after reset to
102a072d900d56c54ced6144666d35e373fe84b1
* commit '
cfe99e79a6ae4d9fd08d09ecd66cee5da8a5fb95':
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
releax wait timeout on start of dumpstate service
Santos Cordon [Thu, 22 May 2014 05:58:55 +0000 (22:58 -0700)]
DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit
3fb4de7193e582f9429f34ad0325e85ae514ece2)
Jesse Hall [Tue, 27 May 2014 23:35:10 +0000 (23:35 +0000)]
am
92374318: am
618c78c0: am
dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '
92374318b82945f3d03461f3d0c659adb8409fc5':
EGL: add x86/64 assembly code for EGL/GLES wrappers
Jesse Hall [Tue, 27 May 2014 23:31:32 +0000 (23:31 +0000)]
am
618c78c0: am
dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '
618c78c032ce84c02724a1e5a7f439fa788ecf3a':
EGL: add x86/64 assembly code for EGL/GLES wrappers
Jesse Hall [Tue, 27 May 2014 23:29:20 +0000 (23:29 +0000)]
am
dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '
dc2736219fa897840d1ff12b11cd7defb636f845':
EGL: add x86/64 assembly code for EGL/GLES wrappers
Jesse Hall [Tue, 27 May 2014 23:26:15 +0000 (23:26 +0000)]
Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
Aravind Akella [Tue, 27 May 2014 19:38:00 +0000 (19:38 +0000)]
Merge "Surface maxDelay and isWakeUpSensor flag in Sensor.java."
Etienne Le Grand [Tue, 27 May 2014 18:14:51 +0000 (18:14 +0000)]
am
b3a65bb0: am
9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-dev
* commit '
b3a65bb0c2d2f6e660510efe0d93b3d26b0b2bf9':
Add heart rate to ASensorEvent
Etienne Le Grand [Tue, 27 May 2014 18:10:16 +0000 (18:10 +0000)]
am
9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-dev
* commit '
9dcd38ad3b8335308b59932718e3f145aa50d318':
Add heart rate to ASensorEvent
Etienne Le Grand [Tue, 27 May 2014 18:02:49 +0000 (18:02 +0000)]
Merge "Add heart rate to ASensorEvent" into klp-modular-dev
mwajdecz [Mon, 26 May 2014 11:56:37 +0000 (13:56 +0200)]
EGL: add x86/64 assembly code for EGL/GLES wrappers
There was no explicit support for x86/64 architecture in EGL/GLES wrappers.
This resulted either in failures or sub-optimal implementation of the wrapper functions.
Change-Id: I20d99d7372fbf642ee4b94a05c8cb971cba29988
Signed-off-by: Wajdeczko, Michal <michal.wajdeczko@intel.com>
Aravind Akella [Wed, 14 May 2014 01:20:30 +0000 (18:20 -0700)]
Surface maxDelay and isWakeUpSensor flag in Sensor.java.
Change-Id: Idd1e9045190beeca87b086b272e8cbf0bed05bae
Etienne Le Grand [Fri, 23 May 2014 00:15:08 +0000 (17:15 -0700)]
Add heart rate to ASensorEvent
Change-Id: Ic82838b17a575de93d499e44a454bb382f17678f
Aravind Akella [Fri, 23 May 2014 18:04:27 +0000 (18:04 +0000)]
am
040730e8: am
1236710b: Remove getRequiredPermission from NDK.
* commit '
040730e8954b2f686390434646f82bc333de7058':
Remove getRequiredPermission from NDK.
Dan Stoza [Thu, 22 May 2014 22:59:05 +0000 (15:59 -0700)]
SurfaceFlinger: Add sourceCrop to screenshot
Adds a sourceCrop Rect parameter to screenshot commands, which allows
clients to capture only a portion of the screen instead of the whole
screen.
Bug:
15137922
Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
Aravind Akella [Thu, 22 May 2014 22:44:55 +0000 (22:44 +0000)]
am
1236710b: Remove getRequiredPermission from NDK.
* commit '
1236710bccd8f5870c0281e24a899c3d58f708e6':
Remove getRequiredPermission from NDK.
Santos Cordon [Thu, 22 May 2014 21:21:29 +0000 (21:21 +0000)]
Merge "Allow "telecomm" service to be registered with the phone UID."
Aravind Akella [Thu, 22 May 2014 20:19:49 +0000 (13:19 -0700)]
Remove getRequiredPermission from NDK.
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
The Android Automerger [Thu, 22 May 2014 14:22:05 +0000 (07:22 -0700)]
merge in master-release history after reset to
102a072d900d56c54ced6144666d35e373fe84b1
The Android Automerger [Thu, 22 May 2014 12:50:26 +0000 (05:50 -0700)]
merge in master-release history after reset to
fca1b54031a1ba2a3c82bbbbe71716cd7e6a61d7
Santos Cordon [Thu, 22 May 2014 05:58:55 +0000 (22:58 -0700)]
Allow "telecomm" service to be registered with the phone UID.
Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
Jesse Hall [Thu, 22 May 2014 04:43:19 +0000 (04:43 +0000)]
Merge "opengl: Fix include style in generated JNI code"
Jesse Hall [Thu, 22 May 2014 04:42:19 +0000 (04:42 +0000)]
Merge "opengl: Un-hide GLES31 and GLES31Ext classes"
Jesse Hall [Thu, 22 May 2014 04:41:53 +0000 (04:41 +0000)]
Merge "opengl: Add GLES31 and GLES31Ext class templates"
Jesse Hall [Sun, 18 May 2014 05:46:13 +0000 (22:46 -0700)]
opengl: Regenerate code with ES 3.1 and new extensions
Enable ES 3.1 generation in glgen.py, and regenerate everything to add
support for that as well as these new extensions in the registry:
- EXT_copy_image
- EXT_draw_buffers_indexed
- EXT_geometry_shader
- EXT_gpu_shader5
- EXT_primitive_bounding_box
- EXT_shader_implicit_conversions
- EXT_shader_io_blocks
- EXT_tessellation_shader
- EXT_texture_border_clamp
- EXT_texture_buffer
- EXT_texture_cube_map_array
- EXT_texture_view
Bug:
15028495
Change-Id: I3f45a7ef5367c70e54ce6b36a8c030ae11033434
Jesse Hall [Sun, 18 May 2014 05:46:36 +0000 (22:46 -0700)]
opengl: Add EXT_primitive_bounding_box to registry
This extension hasn't been published yet, so it isn't in the public
registry. That will change before the next platform release to AOSP.
Bug:
15028495
Change-Id: I3f8ac50e6a7f782738518cfd4571b07f94f83c49
Jesse Hall [Sun, 18 May 2014 05:25:45 +0000 (22:25 -0700)]
opengl: Update registry and headers from Khronos
gl.xml @ r26697:
https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api
GLES headers @ r26698:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api
Bug:
15028495
Change-Id: I57e0d8caac2bc2edb10c8252e06ffdb9a5ccf48b
Jesse Hall [Wed, 21 May 2014 22:03:44 +0000 (22:03 +0000)]
Merge "opengl: Update GLES headers and generate *.in from registry XML"
Jesse Hall [Wed, 14 May 2014 04:52:56 +0000 (21:52 -0700)]
opengl: Update GLES headers and generate *.in from registry XML
Import GLES headers from Khronos SVN r26322:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api
There are many non-functional whitespace and parameter name changes
included here. These were introduced upstream when converting from the
old .spec registry to the new XML registry.
There are also some new extensions added. Unfortunately there isn't a
version of the XML that matches the headers the previous versions of
the *.in files were generated from, so I can't separate out the
non-functional changes from the new extensions (other than temporarily
hacking them out of the XML). See below for a list.
Finally, I had to hack the official glext.h. Khronos hasn't updated
the official GLES1 headers since switching to the XML registry, and
there is one critical difference: a "const void**" parameter in the
official header is "const void* const*" in the registry. I changed the
header to avoid build errors with code generated from the registry.
Dependencies on the *.in files required manually updating some
GLES_trace/ files as well:
- gltrace_api.{h,cpp} must be manually re-generated using
tools/genapi.py.
- New GL prototypes must be manually added to gltrace.proto.
- gltrace.pb.{h,cpp} must be regenerated using aprotoc (see dev.make)
New GLES extensions in libs/GLES_CM/glext_api.in:
- GL_OES_byte_coordinates
- GL_EXT_map_buffer_range
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync
New GLES2 extensions in libs/GLES2/gl2ext_api.in:
- GL_KHR_blend_equation_advanced
- GL_KHR_debug
- GL_OES_sample_shading
- GL_OES_texture_storage_multisample_2d_array
- GL_EXT_disjoint_timer_query
- GL_EXT_draw_buffers
- GL_EXT_draw_instanced
- GL_EXT_instanced_arrays
- GL_EXT_map_buffer_range
- GL_EXT_map_buffer_range
- GL_EXT_multiview_draw_buffers
- GL_EXT_separate_shader_objects
- GL_ANGLE_instanced_arrays
- GL_ANGLE_translated_shader_source
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync
- GL_INTEL_performance_query
- GL_NV_blend_equation_advanced
- GL_NV_copy_buffer
- GL_NV_draw_instanced
- GL_NV_framebuffer_blit
- GL_NV_framebuffer_multisample
- GL_NV_instanced_arrays
- GL_NV_non_square_matrices
Bug:
15028495
Change-Id: I902517c23354e14f9c63b1584db286d682315bb5
The Android Automerger [Wed, 21 May 2014 12:50:22 +0000 (05:50 -0700)]
merge in master-release history after reset to
b9e879d429945cebc12a52e1ceaf0846eea564f1
Jeff Brown [Wed, 21 May 2014 02:34:36 +0000 (02:34 +0000)]
Merge "Support VIRTUAL flag in keyboard layouts."
Jeff Brown [Wed, 21 May 2014 00:27:38 +0000 (17:27 -0700)]
Support VIRTUAL flag in keyboard layouts.
This flag is used to provide haptic feedback for virtual hard keys.
Bug:
14319563
Change-Id: Ia0ca1acc8cfa00a42d1c04d279dfa59c6cc00f4d
Andy McFadden [Tue, 20 May 2014 22:29:48 +0000 (22:29 +0000)]
Merge "Add IMPLEMENTATION_DEFINED to dump"
Jesse Hall [Tue, 20 May 2014 21:59:36 +0000 (21:59 +0000)]
Merge "Revert "Update GLES headers from Khronos SVN r26322""
Jesse Hall [Tue, 20 May 2014 21:59:29 +0000 (21:59 +0000)]
Revert "Update GLES headers from Khronos SVN r26322"
This reverts commit
20670e33c76a32370695a82a3e7f2fb30be30608.
Change-Id: Iae3dfbaf852ff1b6906af1d5508c2baf1173b481
Jesse Hall [Tue, 20 May 2014 21:38:55 +0000 (21:38 +0000)]
Merge "Revert "opengl: Generate *.in from registry XML""
Jesse Hall [Tue, 20 May 2014 21:38:44 +0000 (21:38 +0000)]
Revert "opengl: Generate *.in from registry XML"
This reverts commit
4a73962c694bfe57eb2bea40ed6fb626be7006aa.
Change-Id: I1fa5cbe4d0b86f6df69d616157b3fec68d706d7a
Jesse Hall [Tue, 20 May 2014 21:37:33 +0000 (21:37 +0000)]
Merge "Revert "opengl: Update registry and headers from Khronos""
Jesse Hall [Tue, 20 May 2014 21:29:48 +0000 (21:29 +0000)]
Merge "Revert "opengl: Add EXT_primitive_bounding_box to registry""
Jesse Hall [Tue, 20 May 2014 21:29:27 +0000 (21:29 +0000)]
Merge "Revert "opengl: Regenerate code with ES 3.1 and new extensions""
Jesse Hall [Tue, 20 May 2014 21:27:40 +0000 (21:27 +0000)]
Revert "opengl: Update registry and headers from Khronos"
This reverts commit
f466a51c1325d2034326e25dd61c359ed2c566af.
Change-Id: I2fe400e2dab8327695c36dc8eed101654368cd4b
Jesse Hall [Tue, 20 May 2014 21:27:28 +0000 (21:27 +0000)]
Revert "opengl: Add EXT_primitive_bounding_box to registry"
This reverts commit
a66730f78796664fb5232aa4c1139f4b837beaf4.
Change-Id: Idc7b589316f95ca48eced9d1c30c56acd9466410
Jesse Hall [Tue, 20 May 2014 21:27:17 +0000 (21:27 +0000)]
Revert "opengl: Regenerate code with ES 3.1 and new extensions"
This reverts commit
6cb7d3dc9f1ce37547646979e0625992264ea4d0.
Change-Id: I2eb7fd721dda9c14a0bfcef1b1c9d9843bbec94b
Jesse Hall [Tue, 20 May 2014 03:54:49 +0000 (20:54 -0700)]
opengl: Fix include style in generated JNI code
Bug:
15028495
Change-Id: Ie38d398751a374f11bef8944a2aa0f8311934911
Jesse Hall [Mon, 19 May 2014 23:23:14 +0000 (16:23 -0700)]
opengl: Un-hide GLES31 and GLES31Ext classes
Bug:
15028495
Change-Id: Iaac1e8d2ad5ea840d728a78804e2566be18a4340
Jesse Hall [Mon, 19 May 2014 22:12:22 +0000 (15:12 -0700)]
opengl: Add GLES31 and GLES31Ext class templates
Bug:
15028495
Change-Id: I276d04f029d441e092428fad72f09ca15e1d233a
Andy McFadden [Tue, 20 May 2014 20:28:50 +0000 (13:28 -0700)]
Add IMPLEMENTATION_DEFINED to dump
The "dumpsys SurfaceFlinger" output shows pixel formats in
human-readable form now. Add IMPLEMENTATION_DEFINED.
Change-Id: If567e34dad4b940fbfb4d0b70c65f6ab8cd5f5e7
Jesse Hall [Tue, 20 May 2014 18:42:20 +0000 (18:42 +0000)]
Merge "opengl: Regenerate code with ES 3.1 and new extensions"
Jesse Hall [Tue, 20 May 2014 18:39:52 +0000 (18:39 +0000)]
Merge "opengl: Add EXT_primitive_bounding_box to registry"
Jesse Hall [Tue, 20 May 2014 18:39:32 +0000 (18:39 +0000)]
Merge "opengl: Update registry and headers from Khronos"
Jesse Hall [Tue, 20 May 2014 18:39:16 +0000 (18:39 +0000)]
Merge "opengl: Generate *.in from registry XML"
Jesse Hall [Tue, 20 May 2014 18:38:47 +0000 (18:38 +0000)]
Merge "Update GLES headers from Khronos SVN r26322"
Ben Murdoch [Tue, 20 May 2014 17:30:21 +0000 (17:30 +0000)]
am
2bb7438c: am
c210aec4: Merge "Add android.software.webview software feature." into klp-modular-dev
* commit '
2bb7438c8ef1b4f09063250d5efe6dc98c10bdd7':
Add android.software.webview software feature.
The Android Automerger [Tue, 20 May 2014 12:50:10 +0000 (05:50 -0700)]
merge in master-release history after reset to
ca2fbf6982828562a9dee60a68d7cb4b595c430e
Ben Murdoch [Tue, 20 May 2014 09:35:34 +0000 (09:35 +0000)]
am
c210aec4: Merge "Add android.software.webview software feature." into klp-modular-dev
* commit '
c210aec479e2e3e2a5e7f355f28fe9625a23f707':
Add android.software.webview software feature.
Ben Murdoch [Tue, 20 May 2014 09:31:58 +0000 (09:31 +0000)]
Merge "Add android.software.webview software feature." into klp-modular-dev
Jinsuk Kim [Tue, 20 May 2014 00:34:06 +0000 (00:34 +0000)]
Merge "New keycode definitions for HDMI-CEC"
Jesse Hall [Mon, 19 May 2014 23:49:07 +0000 (23:49 +0000)]
Merge "Import GL registry from upstream @r26448."
Jesse Hall [Mon, 19 May 2014 23:48:54 +0000 (23:48 +0000)]
Merge "Remove vestigial remnants of GLES2_dbg"
Jesse Hall [Mon, 19 May 2014 23:48:40 +0000 (23:48 +0000)]
Merge "Disable warnings when generating GL wrappers"