LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,816 Commits 2 Branches 0 Tags
f06ece3a645c071ade65b175cd022e0b26ea37a7
Commit Graph

8816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladimir Chtchetkine
8e5b43f196 am d18dbeca: Merge "Update supported frame sizes for fake camera" 
* commit 'd18dbecaf21fd82e819052a44ad67bade7349d4f':
  Update supported frame sizes for fake camera
 2011-11-23 06:44:13 -08:00
Vladimir Chtchetkine
d18dbecaf2 Merge "Update supported frame sizes for fake camera" 2011-11-23 06:42:23 -08:00
Jean-Baptiste Queru
c9733d9155 am 027b026b: am 62c9a8ac: am 31ef1de4: Revert "Add missing -lX11 on the link line." 
* commit '027b026b09d066bf9386bf9ba7df2cc0a8626663':
  Revert "Add missing -lX11 on the link line."
 2011-11-22 17:17:13 -08:00
Jean-Baptiste Queru
027b026b09 am 62c9a8ac: am 31ef1de4: Revert "Add missing -lX11 on the link line." 
* commit '62c9a8aca24900c5efef7081a942090ddfa6f1c4':
  Revert "Add missing -lX11 on the link line."
 2011-11-22 17:15:32 -08:00
Jean-Baptiste Queru
62c9a8aca2 am 31ef1de4: Revert "Add missing -lX11 on the link line." 
* commit '31ef1de4590c4c88f3f5d85ccc44e53c8fa56cde':
  Revert "Add missing -lX11 on the link line."
 2011-11-22 17:14:06 -08:00
Jean-Baptiste Queru
31ef1de459 Revert "Add missing -lX11 on the link line." 
This reverts commit 8dca56ba8d.
 2011-11-22 17:10:27 -08:00
Jesse Hall
d8b4c21e2c am 0ede7480: am 34141787: am 3a655154: am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit '0ede748027596ca6f07e6404671745e84528175b':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:50:33 -08:00
Jesse Hall
0ede748027 am 34141787: am 3a655154: am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit '3414178724afeb07d2243544460ada97a09ffa7e':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:48:14 -08:00
Jesse Hall
3414178724 am 3a655154: am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit '3a655154d00e5ea67218bc3b5afb09b654a17156':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:46:25 -08:00
Jesse Hall
d54b8d34e5 am 0bcca2c8: am afc9f5bc: am 25902c05: am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit '0bcca2c8908d22a4d0903131de877a37a7993855':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:44:07 -08:00
Jesse Hall
d97ddfc00d am 24dc87cd: am b43a6245: am f25dc0f6: am faaf1553: EmuGL: set texture info from EGLImage 
* commit '24dc87cd2ad41cfd85e9f2d651434b7195f19858':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:44:07 -08:00
Jesse Hall
3a655154d0 am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit 'af4f66be50b17c8b8fce1dda53389bb0a10968ba':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:43:26 -08:00
Jesse Hall
0bcca2c890 am afc9f5bc: am 25902c05: am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit 'afc9f5bcfe16481d124ae7721f18e9bdcae3ad14':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:42:24 -08:00
Jesse Hall
24dc87cd2a am b43a6245: am f25dc0f6: am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'b43a624544ccc5bef1d267d9d8a0dff9043a677c':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:42:23 -08:00
Jesse Hall
afc9f5bcfe am 25902c05: am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit '25902c05406daaaa1605e13a30b1323e14a3acf2':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:39:44 -08:00
Jesse Hall
b43a624544 am f25dc0f6: am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'f25dc0f673a931640a7fcbba2613710ab8667235':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:39:43 -08:00
Jesse Hall
25902c0540 am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit 'f37a7ed6c5c609a3afc33f81bf50893362917ae6':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:37:32 -08:00
Jesse Hall
f25dc0f673 am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'faaf1553cfa39c23ceb198ba7edbd46ff3a11f7a':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:37:31 -08:00
Vladimir Chtchetkine
6f00e7fc48 Update supported frame sizes for fake camera 
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

Change-Id: I63d145c967f1ba83992141ec97700f094a9d53a7
 2011-11-22 15:15:57 -08:00
The Android Open Source Project
7185a87d85 am 5c0b2d06: Reconcile with ics-mr1-release 
* commit '5c0b2d06ae13ddd7676e866b0013f17cac1c44ed':
 2011-11-22 13:29:16 -08:00
The Android Open Source Project
5c0b2d06ae Reconcile with ics-mr1-release 
Change-Id: Ic0f29ada54a71611d2bfb994fdb409d56d304064
 2011-11-22 13:25:35 -08:00
Raphael
6856371e8c am bbd339a3: Merge "SDK: source.properties templates." 
* commit 'bbd339a3d3ff192fa30f6e83f443b983ad5bce38':
  SDK: source.properties templates.
 2011-11-22 12:40:27 -08:00
Raphael
bbd339a3d3 Merge "SDK: source.properties templates." 2011-11-22 12:38:24 -08:00
The Android Automerger
a3e8aa9da3 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:55:33 -08:00
David 'Digit' Turner
f4ed5fbaaa am 904f6923: ndk: Fix <sys/atomics.h> declarations. 
* commit '904f6923b895644d86f17e7a545469b92f02511d':
  ndk: Fix <sys/atomics.h> declarations.
 2011-11-22 11:16:42 -08:00
David 'Digit' Turner
904f6923b8 ndk: Fix <sys/atomics.h> declarations. 
The atomic operations exported by the platform's C library do not
provide full memory barriers. This can result in incorrect results
when NDK machine code linked against them runs on multi-core devices.

While the bug has been fixed in the platform, this NDK header change
ensures that any source code that includes <sys/atomics.h> will end
up using a correct implementation of these functions, based on the
corresponding GCC builtins.

These builtins always provide a full barrier and have reasonable
performance. Application developers who depend on <sys/atomics.h>
should recompile their unmodified sources against this version
of the NDK as soon as possible.

Change-Id: Ife165d09dceffdcd768b69c072d253cac898419c
 2011-11-22 11:18:44 +01:00
Jesse Hall
af4f66be50 EmuGL: implement OES_EGL_image_external for GLESv1 
GLESv2 support will come in a followup change but will take advantage
of the GLClientState changes.

Change-Id: Ib6cbb4dafbd071e3b59b1e5d808b3e23656ada92
 2011-11-21 13:47:49 -08:00
Jesse Hall
f37a7ed6c5 GLES translator: don't delete EGLImage textures 
When remapping a GLES texture to a different GL texture in
glEGLImageTargetTexture2DOES(), the GLES texture's previous GL texture was
deleted unconditionally. This is bad when it came from an EGLImage and is
therefore owned by (and will continue to be used by) some other object.

The code now skips deleting the old GL texture if it came from an EGLImage.
This mirrors the logic in glDeleteTextures().

Change-Id: I5b650334a7019d824517c2915b1f23961fbbd809
 2011-11-21 13:14:19 -08:00
Jason Sams
39a2f958e3 Merge "New compute sample for simple image processing." into graphics-dev 2011-11-18 17:48:27 -08:00
Jason Sams
f347e62207 New compute sample for simple image processing. 
Change-Id: I0aeada2d425a0e4f915fc2f8f8af111329297709
 2011-11-18 16:26:14 -08:00
The Android Open Source Project
1596de8fbd am 243d1e27: Reconcile with ics-mr1-release 
* commit '243d1e27f7b6788c2a05a7e010baae4a5c290927':
 2011-11-18 15:44:00 -08:00
The Android Open Source Project
243d1e27f7 Reconcile with ics-mr1-release 
Change-Id: I071634b40bad4ccdf306f8dfc881ea6630bbab7d
 2011-11-18 15:42:21 -08:00
Jean-Baptiste Queru
b4d3ec2416 am 2cb7d006: am 189281a7: am 8dca56ba: Add missing -lX11 on the link line. 
* commit '2cb7d006ac85333f152905b1bf726f8fa8017eb3':
  Add missing -lX11 on the link line.
 2011-11-18 15:27:25 -08:00
Svetoslav Ganov
ab573421b9 am 84ed1bb1: am 19c93bac: am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit '84ed1bb1de1ee6eda2498e56a0ddca890ccf0fa7':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 15:27:25 -08:00
Jean-Baptiste Queru
2cb7d006ac am 189281a7: am 8dca56ba: Add missing -lX11 on the link line. 
* commit '189281a755ef5df5d16be0b94dd3e71059f28e92':
  Add missing -lX11 on the link line.
 2011-11-18 15:23:15 -08:00
Svetoslav Ganov
84ed1bb1de am 19c93bac: am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit '19c93baca796c7cd9c7317e6a68d2f4cabbf915b':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 15:22:35 -08:00
Jesse Hall
faaf1553cf EmuGL: set texture info from EGLImage 
The EGL->GL translator implementation of glEGLImageTargetTexture2DOES was
properly replacing uses of the target texture object with the texture object
associated with the EGLImage in the host GL library, but wasn't updating its
own info about the texture (dimensions, etc.). This broke places where the
translator relied on knowing this, e.g. when implementing the GLES glDrawTexi
call on top of GL glDrawArrays.

Change-Id: Ia4aefd89852a2609221c56da76bfac927464c0b2
 2011-11-18 14:11:49 -08:00
Jean-Baptiste Queru
189281a755 am 8dca56ba: Add missing -lX11 on the link line. 
* commit '8dca56ba8d98c40fee0e6d547a49b0f7325efffc':
  Add missing -lX11 on the link line.
 2011-11-18 13:50:33 -08:00
Jean-Baptiste Queru
8dca56ba8d Add missing -lX11 on the link line. 
Change-Id: I881c1740bc6ae3a4086f6a400b5d0b9973b61a78
 2011-11-18 12:08:39 -08:00
Svetoslav Ganov
19c93baca7 am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit 'cd2db139ae4bbfbe7f8fa74a8b899328f2ff3c77':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 10:14:03 -08:00
Fred Chung
0b489a4995 am 0ddf5b01: am b1ea3257: (-s ours) am b47c44c2: am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit '0ddf5b014052cdaafafa52503bdf4f5ac21e6979':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 16:00:23 -08:00
Fred Chung
0ddf5b0140 am b1ea3257: (-s ours) am b47c44c2: am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit 'b1ea3257b3b98963e2cd38077649ba670d863953':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 15:56:32 -08:00
Svetoslav Ganov
cd2db139ae Add the support libraries to the platform documentation (demos). 
Updated the support demos due to renamed support classes.

bug:5629339

Change-Id: Ia94cd60ea2b89ad74003baaa8eb8e84d21822374
 2011-11-17 15:15:24 -08:00
Fred Chung
b1ea3257b3 am b47c44c2: am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit 'b47c44c2101199049c37d9c06c8906d24a9d2f10':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 14:53:42 -08:00
Fred Chung
b47c44c210 am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit '512ea9b6f8cc75ec74a7ab8d1c38dec201667f1e':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 14:49:25 -08:00
James Dong
c6d75104ad am 43a67b48: am b62c5b91: am f8781452: Update the media_profiles.xml file to include maximum memory usage support for video editor 
* commit '43a67b48c213c6264de6024d7b3eca2f296adff1':
  Update the media_profiles.xml file to include maximum memory usage support for video editor
 2011-11-17 07:52:01 -08:00
James Dong
43a67b48c2 am b62c5b91: am f8781452: Update the media_profiles.xml file to include maximum memory usage support for video editor 
* commit 'b62c5b9156d589ea8aaa6c441530b2ef371f1915':
  Update the media_profiles.xml file to include maximum memory usage support for video editor
 2011-11-17 07:48:19 -08:00
The Android Automerger
b911dde9d4 merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:45:52 -08:00
Fred Chung
839427847c am 4c23a87d: am e39ad49b: am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 
* commit '4c23a87d7a05452a33644a7418db8be16b1ed63d':
  SDK sample code for Bluetooth HDP API.
 2011-11-17 04:10:53 -08:00
Fred Chung
4c23a87d7a am e39ad49b: am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 
* commit 'e39ad49b453230058ff77df70565360975a68f04':
  SDK sample code for Bluetooth HDP API.
 2011-11-17 04:08:25 -08:00