Tor Norbye
7fb8be5c6a
Update mkstubs from ASM 3.1 to ASM 4.0
...
Change-Id: If43fcdba7070af8ae3d72e7e30a1dcbe11a217ec
2011-12-05 14:30:02 -08:00
Vladimir Chtchetkine
031b92f4c7
Pass white balance and exposure compensation to webcam emulator
...
Using fake camera implementation for WB/exposure, implement the same functionality
on frames comming from webcam emulator. Note that due to heavy computations that
are involved in implementing this, we will do all that math in the emulator
application in order to provide a decent performance.
Change-Id: Id6c37b472860674c91e6ca37522fc61f497515a3
2011-12-05 09:16:23 -08:00
Jesse Hall
2e4b82fe04
am 90fbc9f9: am f1e2c7f6: am c08eaec1: am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0
...
* commit '90fbc9f905fc5c68701a4fb30a7f65cbc0b7bd01':
EmuGL: capture VBO contents in GL2Encoder
2011-12-01 14:43:27 -08:00
Jesse Hall
90fbc9f905
am f1e2c7f6: am c08eaec1: am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0
...
* commit 'f1e2c7f699995f5554764e82495b73ccbdf83a61':
EmuGL: capture VBO contents in GL2Encoder
2011-12-01 14:41:47 -08:00
Jesse Hall
c08eaec1e2
am 96cd9c31: Merge "EmuGL: capture VBO contents in GL2Encoder" into ics-mr0
...
* commit '96cd9c3130b6215534e863b94637b384da8102c9':
EmuGL: capture VBO contents in GL2Encoder
2011-12-01 14:37:51 -08:00
Jesse Hall
7906431d04
EmuGL: capture VBO contents in GL2Encoder
...
The glBufferData, glBufferSubData, and glDeleteBuffers entry points
had interception routines in GL2Encoder which cache the data, but they
weren't hooked up. So when glDrawElements tried to retrieve the cached
data it wasn't there.
Change-Id: Iaed11fccaefab3186485be53a0f15c8ca0a255f9
2011-12-01 12:01:27 -08:00
Jason Sams
edbca34e27
resolved conflicts for merge of d8266150 to graphics-dev
...
Change-Id: Ie39a5e07ddbfcfe9e8161674f1b0912c9f8f49d1
2011-11-30 13:54:40 -08:00
Jason Sams
d8266150ba
Merge "Fixing vector element alignment issues."
2011-11-29 18:00:06 -08:00
Xavier Ducrohet
6038109394
am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge.
...
* commit '2400b2c3402e6585437274f8acd5fd6e32367bb3':
Revert "Update the media_profiles.xml file to include..." do not merge.
2011-11-23 14:41:05 -08:00
Xavier Ducrohet
2400b2c340
Revert "Update the media_profiles.xml file to include..." do not merge.
...
This reverts commit a8fe85ea64
2011-11-23 14:36:58 -08:00
Vladimir Chtchetkine
9a1a290e58
am fd1bdd61: Update supported frame sizes for fake camera. do not merge.
...
* commit 'fd1bdd611a2954bfb171548b8fa288b0319a0aa9':
Update supported frame sizes for fake camera. do not merge.
2011-11-23 14:04:29 -08:00
James Dong
a8fe85ea64
Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
...
related-to-bug: 5625690
(cherry picked from commit f8781452d9
2011-11-23 13:14:50 -08:00
Vladimir Chtchetkine
fd1bdd611a
Update supported frame sizes for fake camera. do not merge.
...
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.
(cherry picked from commit 6f00e7fc48
2011-11-23 13:14:16 -08:00
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
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
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
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
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
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
James Dong
f8781452d9
Update the media_profiles.xml file to include maximum memory usage support for video editor
...
Change-Id: I26eacaaca76b72fc5a43ee8fabacf62060418edd
related-to-bug: 5625690
2011-11-16 14:37:49 -08:00
Mathias Agopian
4f2055d9f5
am 31700968: am b81d6b19: am fb305664: Merge "should fix sdk build" into ics-mr1
...
* commit '3170096834e0b4ed321a973de4fc3777cd22f431':
should fix sdk build
2011-11-15 21:17:36 -08:00
Mathias Agopian
3170096834
am b81d6b19: am fb305664: Merge "should fix sdk build" into ics-mr1
...
* commit 'b81d6b19ecd1cba24bb1093855b4b2c423de36bf':
should fix sdk build
2011-11-15 21:15:56 -08:00
Mathias Agopian
9c14396791
should fix sdk build
...
Change-Id: I5b403056f5245eae9a6476d9d573a3b1c25ea0c6
2011-11-15 21:09:15 -08:00
Alex Sakhartchouk
e27055bdec
Fixing vector element alignment issues.
...
Change-Id: Ie5555b9f5bbbc75e1dfd26d3ccbee84b8f71e018
2011-11-14 17:47:26 -08:00
Jason Sams
16e433ce4a
Merge "Fix build" into graphics-dev
2011-11-10 16:54:15 -08:00
Jason Sams
b3f32a8ab9
Fix build
...
Change-Id: If6d85bf9e9e54613c6dbf7eae4be902142400251
2011-11-10 15:28:08 -08:00
Vladimir Chtchetkine
50ab613ece
Fix temperature sensor
...
Change-Id: I4cc1264f4437172e78b38ce394e4dd005ad1a59f
2011-11-09 18:02:21 -08:00
David Hu
9bc092f5b1
Change the test to user the listener mechanism
...
this is to avoid the precision issue with the coordinates
DO NOT MERGE
Change-Id: Icfab3fa6fd0a331aef12ee71c73bac04dc9685be
2011-11-08 14:43:36 -08:00
