David Turner
90e65d4aa4
am b5e8d4c5: am 81973086: am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"
...
* commit 'b5e8d4c52061ce3ff4153741f37017f299759352':
opengles emulator: GLES2 codec - glFinishRoundTrip
2011-08-10 12:24:43 -07:00
David Turner
22aa5711b8
am eac7fbd6: am e6954209: am fc15a710: Merge "opengles emulator: test: added shader flags to triangleV2 test"
...
* commit 'eac7fbd6b316b0bca6d71ca7ac265935eecc413f':
opengles emulator: test: added shader flags to triangleV2 test
2011-08-10 12:24:34 -07:00
David Turner
f08f3552da
am f1482edd: am 96221311: am 8b5652be: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
...
* commit 'f1482edd61c931a0e49ceb64958817e856d7bb92':
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-10 12:24:25 -07:00
David Turner
938dcb41ae
am 8fbd35c5: am d76a7100: am 0660de71: Merge "emulator opengl: fixed encoding of glGenRendebuffer"
...
* commit '8fbd35c5b1c4a0d1edbbc07a63d4cf4bf66ad5c7':
emulator opengl: fixed encoding of glGenRendebuffer
2011-08-10 12:24:16 -07:00
David Turner
47cf17717e
am 10ed98e0: am e79b525d: am bf13fc81: Merge "opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM"
...
* commit '10ed98e01996e2286210c91288df6b91aaf05b98':
opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM
2011-08-10 12:24:08 -07:00
David Turner
d2685c3ed1
am 8c764ac4: am 853839b7: am 3618e8c9: Merge "opengles emulator: add GL_OES_depth_texture extension"
...
* commit '8c764ac4476aafc0913a08726734eb6905121655':
opengles emulator: add GL_OES_depth_texture extension
2011-08-10 12:23:59 -07:00
David Turner
dbb520c7e5
am c89c5e8c: am 124babe3: am 8abaa9a0: Merge "opengles emulator: fix GL_EXT_packed_depth_stencil string"
...
* commit 'c89c5e8cc7198ed6b2f5d82becb59b48681be353':
opengles emulator: fix GL_EXT_packed_depth_stencil string
2011-08-10 12:23:46 -07:00
David Turner
c9955ab30b
am d30bb0b4: am 2b96b0fc: am 42dd982a: Merge "opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D"
...
* commit 'd30bb0b4b77223136693b9934a22a6ed7528e249':
opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D
2011-08-10 12:23:36 -07:00
David Turner
93d3e26aea
am 5dd949d2: am 42d5bd12: am ad3f4df3: Merge "opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"
...
* commit '5dd949d29c14eb74870c9ce5fa7af21b629d8ece':
opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
2011-08-10 12:23:26 -07:00
David Turner
2bcde19db4
am 6b445a64: am 9e0dba41: am 06524031: Merge "opengles emulator: Call XInitThreads on Linux."
...
* commit '6b445a641c38d4e68322d8270f761157ada9ebf9':
opengles emulator: Call XInitThreads on Linux.
2011-08-10 12:23:16 -07:00
David Turner
d1a865e955
am 984ccfa1: am c4e4ba87: am 0e0638e5: Merge "opengles emulator: fix glGetShaderSource"
...
* commit '984ccfa1714e2bd556fecc50be4801a27e324e81':
opengles emulator: fix glGetShaderSource
2011-08-10 12:23:06 -07:00
David Turner
39e424a7d7
am f0e93f96: am 30dce171: am a75d7c69: Merge "opengles emulator: fix GLESv2 shader source packing"
...
* commit 'f0e93f963461edd60fe04f0ea2620e92ba2008cf':
opengles emulator: fix GLESv2 shader source packing
2011-08-10 12:22:56 -07:00
David Turner
41d23b20a3
am 5473c6ae: am ad3166ad: am 9e883e8b: Merge "opengles emulator: fix eglGetProcAddress"
...
* commit '5473c6ae9915720f06ae14e77b4779af1d161b33':
opengles emulator: fix eglGetProcAddress
2011-08-10 12:22:45 -07:00
David Turner
eb0e8c8c67
am 8c6d04a6: am 53dfd83d: am 23685f03: Merge "opengles emulator: fixed EGLContext and EGLSurface ref-counting."
...
* commit '8c6d04a6622af7cdf970bb0e8deac87cc0d17013':
opengles emulator: fixed EGLContext and EGLSurface ref-counting.
2011-08-10 12:22:34 -07:00
David Turner
63365c01a7
am 87cbeada: am 2ad48e99: am 54502698: Merge "opengles emulator: fix the mixing between pack/unpack alignments"
...
* commit '87cbeada5c446e39219ddde88ab2f1baf86702be':
opengles emulator: fix the mixing between pack/unpack alignments
2011-08-10 12:22:22 -07:00
David Turner
8572c4c25a
am 4b3baea5: am 6b2470ef: am 450fb0a6: Merge "opengles emulator: cache all buffer on the guest"
...
* commit '4b3baea5304207269c54c16e0429d9811d6eaa8a':
opengles emulator: cache all buffer on the guest
2011-08-10 12:22:11 -07:00
David Turner
052c44775b
am 19fdd87f: am 8cfde07c: am a0045f20: Merge "opengles emulator: dynamicaly grow ReadBuffer"
...
* commit '19fdd87fc6bb48557a0f64a6012f101f8427db47':
opengles emulator: dynamicaly grow ReadBuffer
2011-08-10 12:21:59 -07:00
David Turner
d7b16f0ba3
am 8713e385: am ecb7c06f: am 321714ab: Merge "opengles emulator: fix eglGetError"
...
* commit '8713e3858c8868af8b89d1bad8b181f4570b3a1e':
opengles emulator: fix eglGetError
2011-08-10 12:21:47 -07:00
David Turner
9cc4321d10
am 1a30107e: am 81e21789: am c1db962f: Merge "opengles emulator: inc/dec ref-count of buffer on SwapBuffers"
...
* commit '1a30107ecc1828d806737f2b9737d19fd70ec72a':
opengles emulator: inc/dec ref-count of buffer on SwapBuffers
2011-08-10 12:21:34 -07:00
Chris Craik
1ac352eb59
Merge "updated Animation Plugin for NativeWindow interface"
2011-08-09 17:23:32 -07:00
Chris Craik
aceb2e3bda
updated Animation Plugin for NativeWindow interface
...
bug:5114637
Uses new ANativeWindow plugin API, supports either software rendering or GL
rendering via flag in RenderingThread.h
Note: Currently crashes on close
Change-Id: Ia7338a6c38c0ca9db02c19814d99b29970cc7b8e
2011-08-09 16:34:30 -07:00
Daniel Lehmann
a6826891f9
Merge "Start service intent when contact is being displayed"
2011-08-09 14:49:58 -07:00
Daniel Lehmann
af2e1dccbc
Start service intent when contact is being displayed
...
Bug:5138185
Change-Id: I32e239e4af564bb876d1eb021f31b2fd6287feaf
2011-08-09 13:42:08 -07:00
David 'Digit' Turner
2a3bcf93a0
am 44d6a0fa: am 4e9cf45c: am 891ad0e8: Merge "emulator: opengl: Make render_api.h C-compatible"
...
* commit '44d6a0fa6f828f2196dd5a39ca80eff9c2db0922':
emulator: opengl: Make render_api.h C-compatible
2011-08-09 13:37:28 -07:00
David Turner
5647257e6e
am 3374f8ad: am 254a7090: am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98
...
* commit '3374f8ad2cd4fcff7ab40bd80672b8b380242c84':
NDK: x86 header file has incorrect definition for ptrdiff_t
Fix size_t definition in x86 NDK header file
2011-08-09 13:37:17 -07:00
David Turner
b5e8d4c520
am 81973086: am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"
...
* commit '81973086cf93e84fdbac204a4d9dd06cbe72798c':
opengles emulator: GLES2 codec - glFinishRoundTrip
2011-08-09 10:06:58 -07:00
David Turner
eac7fbd6b3
am e6954209: am fc15a710: Merge "opengles emulator: test: added shader flags to triangleV2 test"
...
* commit 'e69542091eec03625b6f63abdf6e6db7c36ad1ca':
opengles emulator: test: added shader flags to triangleV2 test
2011-08-09 10:06:55 -07:00
David Turner
f1482edd61
am 96221311: am 8b5652be: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
...
* commit '96221311b4eb6a139d856c03d360f1abf51a2d33':
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-09 10:06:53 -07:00
David Turner
8fbd35c5b1
am d76a7100: am 0660de71: Merge "emulator opengl: fixed encoding of glGenRendebuffer"
...
* commit 'd76a71002068556c6be39b3b39ca1dc26714f467':
emulator opengl: fixed encoding of glGenRendebuffer
2011-08-09 10:06:50 -07:00
David Turner
10ed98e019
am e79b525d: am bf13fc81: Merge "opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM"
...
* commit 'e79b525d8bb342967bb211cc8a14985ffca9f0af':
opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM
2011-08-09 10:06:47 -07:00
David Turner
8c764ac447
am 853839b7: am 3618e8c9: Merge "opengles emulator: add GL_OES_depth_texture extension"
...
* commit '853839b72a9d58ff9d71027bb673480e898cf42e':
opengles emulator: add GL_OES_depth_texture extension
2011-08-09 10:06:43 -07:00
David Turner
c89c5e8cc7
am 124babe3: am 8abaa9a0: Merge "opengles emulator: fix GL_EXT_packed_depth_stencil string"
...
* commit '124babe3b6e34170b82faee6783e0da9b08fb780':
opengles emulator: fix GL_EXT_packed_depth_stencil string
2011-08-09 10:06:40 -07:00
David Turner
d30bb0b4b7
am 2b96b0fc: am 42dd982a: Merge "opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D"
...
* commit '2b96b0fc993914b3908dd103c05d50768fcbc0dd':
opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D
2011-08-09 10:06:36 -07:00
David Turner
5dd949d29c
am 42d5bd12: am ad3f4df3: Merge "opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"
...
* commit '42d5bd124b94dbcc684c8c3840891bbb54278071':
opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
2011-08-09 10:06:32 -07:00
David Turner
6b445a641c
am 9e0dba41: am 06524031: Merge "opengles emulator: Call XInitThreads on Linux."
...
* commit '9e0dba41bfa5f2029618958a7c2fcfa12e1723ad':
opengles emulator: Call XInitThreads on Linux.
2011-08-09 10:06:28 -07:00
David Turner
984ccfa171
am c4e4ba87: am 0e0638e5: Merge "opengles emulator: fix glGetShaderSource"
...
* commit 'c4e4ba87bba41f414ba268a42c1751263480057a':
opengles emulator: fix glGetShaderSource
2011-08-09 10:06:23 -07:00
David Turner
f0e93f9634
am 30dce171: am a75d7c69: Merge "opengles emulator: fix GLESv2 shader source packing"
...
* commit '30dce17194d9290ccac8dd1492ba6d9196eead38':
opengles emulator: fix GLESv2 shader source packing
2011-08-09 10:06:19 -07:00
David Turner
5473c6ae99
am ad3166ad: am 9e883e8b: Merge "opengles emulator: fix eglGetProcAddress"
...
* commit 'ad3166add78dff8407466d271540bbfd20a06320':
opengles emulator: fix eglGetProcAddress
2011-08-09 10:06:14 -07:00
David Turner
8c6d04a662
am 53dfd83d: am 23685f03: Merge "opengles emulator: fixed EGLContext and EGLSurface ref-counting."
...
* commit '53dfd83d48777e0196117322a498cea8cc29f863':
opengles emulator: fixed EGLContext and EGLSurface ref-counting.
2011-08-09 10:06:09 -07:00
David Turner
87cbeada5c
am 2ad48e99: am 54502698: Merge "opengles emulator: fix the mixing between pack/unpack alignments"
...
* commit '2ad48e99d267e1d03e27e8f49c95b753e2bcf41a':
opengles emulator: fix the mixing between pack/unpack alignments
2011-08-09 10:06:03 -07:00
David Turner
4b3baea530
am 6b2470ef: am 450fb0a6: Merge "opengles emulator: cache all buffer on the guest"
...
* commit '6b2470ef2b1e9915ad6303607aefd8659ebc502c':
opengles emulator: cache all buffer on the guest
2011-08-09 10:05:58 -07:00
David Turner
19fdd87fc6
am 8cfde07c: am a0045f20: Merge "opengles emulator: dynamicaly grow ReadBuffer"
...
* commit '8cfde07c61e9ab0b8b9d8815547124545f59f80d':
opengles emulator: dynamicaly grow ReadBuffer
2011-08-09 10:05:52 -07:00
David Turner
8713e3858c
am ecb7c06f: am 321714ab: Merge "opengles emulator: fix eglGetError"
...
* commit 'ecb7c06ff4a670ea473ac053aaa9c0f99f4e0bf6':
opengles emulator: fix eglGetError
2011-08-09 10:05:46 -07:00
David Turner
1a30107ecc
am 81e21789: am c1db962f: Merge "opengles emulator: inc/dec ref-count of buffer on SwapBuffers"
...
* commit '81e21789a87f530cec499694186885cbe059b7db':
opengles emulator: inc/dec ref-count of buffer on SwapBuffers
2011-08-09 10:05:39 -07:00
David Turner
81973086cf
am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"
...
* commit 'c7fb2970ef5a17cbba2bb406a574b078061d0d50':
opengles emulator: GLES2 codec - glFinishRoundTrip
2011-08-09 08:56:25 -07:00
David Turner
e69542091e
am fc15a710: Merge "opengles emulator: test: added shader flags to triangleV2 test"
...
* commit 'fc15a7103db7b62aea7a8ed5260a8a43102afdda':
opengles emulator: test: added shader flags to triangleV2 test
2011-08-09 08:56:23 -07:00
David Turner
96221311b4
am 8b5652be: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
...
* commit '8b5652be729352613bb874cef51c2556b2c00170':
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-09 08:44:35 -07:00
David Turner
d76a710020
am 0660de71: Merge "emulator opengl: fixed encoding of glGenRendebuffer"
...
* commit '0660de71ee9956ca5b5b90860cec03a5ddd9e5f2':
emulator opengl: fixed encoding of glGenRendebuffer
2011-08-09 08:44:33 -07:00
David Turner
e79b525d8b
am bf13fc81: Merge "opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM"
...
* commit 'bf13fc811bc23b22d9d3ceef3cb12d7ec70bc6fe':
opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM
2011-08-09 08:44:31 -07:00
David Turner
853839b72a
am 3618e8c9: Merge "opengles emulator: add GL_OES_depth_texture extension"
...
* commit '3618e8c98b238f6abc1eeddda97c75a9140c52ae':
opengles emulator: add GL_OES_depth_texture extension
2011-08-09 08:44:29 -07:00