David Turner
c35b6f7225
am 5a757de2: am 23839223: Merge "emulator gralloc: Make the cb_handle_t::validate static"
...
* commit '5a757de276415f6c61fb47265375b36bf3da8ee7':
emulator gralloc: Make the cb_handle_t::validate static
2011-07-01 03:21:53 -07:00
David Turner
737db05fe4
am b62e461e: am 580a5748: Merge " opengl translator: Fix windows runtime problems"
...
* commit 'b62e461ec46d8252b3fbca61bb63eb25aba2e5a8':
opengl translator: Fix windows runtime problems
2011-07-01 03:21:41 -07:00
David Turner
5a757de276
am 23839223: Merge "emulator gralloc: Make the cb_handle_t::validate static"
...
* commit '23839223b97e2bba2091627a90bbc2a9454545c1':
emulator gralloc: Make the cb_handle_t::validate static
2011-07-01 03:17:42 -07:00
David Turner
b62e461ec4
am 580a5748: Merge " opengl translator: Fix windows runtime problems"
...
* commit '580a57485345cda018df4c63f65d3a9a8a61ce5b':
opengl translator: Fix windows runtime problems
2011-07-01 03:17:40 -07:00
David Turner
99acb819bf
am fbfb73b4: am 0c074ddb: Merge "Setting Renderer default libs to use translator libs"
...
* commit 'fbfb73b40593389ea91c147da5ee374c841009dd':
Setting Renderer default libs to use translator libs
2011-07-01 03:10:53 -07:00
David Turner
94d4f55f1c
am 0c06eaf3: am ebc56952: Merge "emulator opengl: fix windows build"
...
* commit '0c06eaf38c9982bc3ede0c351f4f0165f59283b0':
emulator opengl: fix windows build
2011-07-01 03:10:51 -07:00
David Turner
c6f4edf37e
am 391237dd: am 89a74292: Merge "emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit"
...
* commit '391237dda869e27a0d5e82888dfed0dfa87c3241':
emulator GLESv2: fixed (#16 ) NenaMark crashes on exit
2011-07-01 03:10:49 -07:00
David Turner
3206de396d
am a42a3deb: am ece2077b: Merge "emulator opengl: add GLESv2 support to driver + renderer"
...
* commit 'a42a3deb874a1be0fb27656367efc749a875884e':
emulator opengl: add GLESv2 support to driver + renderer
2011-07-01 03:10:46 -07:00
David Turner
fbfb73b405
am 0c074ddb: Merge "Setting Renderer default libs to use translator libs"
...
* commit '0c074ddb09f23682bde109aaa1bb201967ad892e':
Setting Renderer default libs to use translator libs
2011-07-01 03:05:03 -07:00
David Turner
0c06eaf38c
am ebc56952: Merge "emulator opengl: fix windows build"
...
* commit 'ebc56952c7d34754c334fdeb1ecef5622ef258b9':
emulator opengl: fix windows build
2011-07-01 03:05:01 -07:00
David Turner
391237dda8
am 89a74292: Merge "emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit"
...
* commit '89a74292b331514a7e54e9971258b8ad99d31965':
emulator GLESv2: fixed (#16 ) NenaMark crashes on exit
2011-07-01 03:04:59 -07:00
David Turner
a42a3deb87
am ece2077b: Merge "emulator opengl: add GLESv2 support to driver + renderer"
...
* commit 'ece2077bdd97f42247c022ed9ee87742ef0d1756':
emulator opengl: add GLESv2 support to driver + renderer
2011-07-01 03:04:57 -07:00
David Turner
23839223b9
Merge "emulator gralloc: Make the cb_handle_t::validate static"
2011-07-01 03:03:47 -07:00
David Turner
580a574853
Merge " opengl translator: Fix windows runtime problems"
2011-07-01 03:02:31 -07:00
David Turner
0c074ddb09
Merge "Setting Renderer default libs to use translator libs"
2011-07-01 03:00:26 -07:00
David Turner
ebc56952c7
Merge "emulator opengl: fix windows build"
2011-07-01 02:59:35 -07:00
David Turner
89a74292b3
Merge "emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit"
2011-07-01 02:57:17 -07:00
David Turner
ece2077bdd
Merge "emulator opengl: add GLESv2 support to driver + renderer"
2011-07-01 02:56:33 -07:00
Stas Gurtovoy
8793e54e60
emulator gralloc: Make the cb_handle_t::validate static
...
This is nicer, since it checks the handle itself, not counting on the caller to check it
Change-Id: I7eba6292dee8e0832a8c0074f508c07c3bc43ff2
2011-06-30 09:14:16 +03:00
Amit Feller
87363ca283
opengl translator: Fix windows runtime problems
...
fixed functions calling conventions in dispatch tables,
added link flag to translator libraries to produce an alias
function for all exported functions with stdcall name mangling.
Change-Id: I4360f26da1f897764ba6d4dd02c365ed00420b51
2011-06-30 09:14:16 +03:00
Amit Feller
a20ba0e4de
Setting Renderer default libs to use translator libs
...
Change-Id: I853a30ce1aa7325d01a30b30c18f4e0bd5a5702f
2011-06-30 09:14:16 +03:00
Amit Feller
efcbbc3f28
emulator opengl: fix windows build
...
Change-Id: I145c7bf3a664fdb2c9e113cd977b4b2431d0668d
2011-06-30 09:14:16 +03:00
Stas Gurtovoy
118af85051
emulator GLESv2: fixed ( #16 ) NenaMark crashes on exit
...
The GL2Encoder::m_compressedTextureFormats member wasn't initialized, so the d'tor
would sometimes crash trying to delete it. Also init m_num_compressedTextureFormats.
Change-Id: Iae423c16a84a4e454e0e1167f7478f9e2f6183c0
2011-06-30 09:14:16 +03:00
Stas Gurtovoy
62d074d9f8
emulator opengl: add GLESv2 support to driver + renderer
...
Added GLESv2 library to system.
Made fixes to the host libOpenGLRender to
compile and support GLESv2 (defined WITH_GLES2).
Other fixes required to make GLESv2 to work.
Change-Id: I9eb198e6092e7fa3550342c50929dd1714282cb3
2011-06-30 09:14:12 +03:00
David 'Digit' Turner
f249fb4fe0
am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit 'eff8b9de35890bf50093d38ef5e9e81557ad4a9c':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:51:26 -07:00
David 'Digit' Turner
eff8b9de35
am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit '39386d450fdc2f170f5f7c94d76c38061fd5a9e0':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:46:04 -07:00
David 'Digit' Turner
39386d450f
Merge "sdk: Copy ABI-specific kernel image to platform image directory."
2011-06-29 02:42:09 -07:00
David 'Digit' Turner
f7f6842b32
sdk: Copy ABI-specific kernel image to platform image directory.
...
This patch depends on https://review.source.android.com/24052
It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.
This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
prebuilt/android-arm/kernel/kernel-qemu
Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
2011-06-29 11:32:17 +02:00
Anirudh Dewani
12c15c512b
am bc4ea2d9: am fea911d5: Network detection sample using TelephonyManager
...
* commit 'bc4ea2d9326f24097b0fdd8ca7090688c0f6743b':
Network detection sample using TelephonyManager
2011-06-29 02:18:53 -07:00
Anirudh Dewani
bc4ea2d932
am fea911d5: Network detection sample using TelephonyManager
...
* commit 'fea911d5359f1eb42ff8b9c70cd6f51500f539d4':
Network detection sample using TelephonyManager
2011-06-29 02:16:23 -07:00
David Turner
868d428666
am 4e9130a6: am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit '4e9130a6f49bec0caceba6974b082a21f244b2c1':
emulator opengl: fixed wrong delete
2011-06-28 04:59:24 -07:00
David Turner
cb4d9ff2a8
am 26025f17: am 5b060ef9: Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* commit '26025f179e8e51bce376cf7fdad42bcfdcd58fff':
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:59:21 -07:00
David Turner
1cac4c4787
am b072bc8b: am 052effb8: Merge "Fix an iligal "free"."
...
* commit 'b072bc8bf3ea2c09f27495b5465daeb2cc7e517a':
Fix an iligal "free".
2011-06-28 04:59:19 -07:00
David Turner
4c5e4e1166
am f222e481: am 7c91ae77: Merge "tex 0 is legal."
...
* commit 'f222e481abfcc07bea69a90ce25fea702b5133b4':
tex 0 is legal.
2011-06-28 04:59:17 -07:00
David Turner
b955e57dc3
am ab37200b: am de74b496: Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
...
* commit 'ab37200b39ae24054c428479cbed63596297773d':
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
2011-06-28 04:57:41 -07:00
David Turner
4e9130a6f4
am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit 'bcb0c197a1d13d2c48ff98dd89f87f15486f1817':
emulator opengl: fixed wrong delete
2011-06-28 04:55:48 -07:00
David Turner
26025f179e
am 5b060ef9: Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* commit '5b060ef926eea0d92f43e1474a5bdbc2dc5794c5':
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:55:46 -07:00
David Turner
b072bc8bf3
am 052effb8: Merge "Fix an iligal "free"."
...
* commit '052effb85f939305f9ff6b743d3447e8e972b75e':
Fix an iligal "free".
2011-06-28 04:55:44 -07:00
David Turner
f222e481ab
am 7c91ae77: Merge "tex 0 is legal."
...
* commit '7c91ae77caa1b277bba162ada95a8a104da9923c':
tex 0 is legal.
2011-06-28 04:55:41 -07:00
David Turner
bcb0c197a1
Merge "emulator opengl: fixed wrong delete"
2011-06-28 04:45:32 -07:00
David Turner
ab37200b39
am de74b496: Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
...
* commit 'de74b496a11b962d9ca3d6188326093b6cfd0c88':
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
2011-06-28 04:45:04 -07:00
David Turner
5b060ef926
Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* changes:
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:44:48 -07:00
David Turner
052effb85f
Merge "Fix an iligal "free"."
2011-06-28 04:39:41 -07:00
David Turner
7c91ae77ca
Merge "tex 0 is legal."
2011-06-28 04:38:57 -07:00
David Turner
de74b496a1
Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
2011-06-28 04:38:18 -07:00
David 'Digit' Turner
5853cce9d0
am 97c9b03f: am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '97c9b03f62cc7d1102d5f4803bb8ed2b511ed060':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:53:27 -07:00
David 'Digit' Turner
97c9b03f62
am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit 'a6896d75d1985270a39e12676469a59dcbb096eb':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:47:29 -07:00
David 'Digit' Turner
a6896d75d1
am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '402b02f8ecbbed55539ee6afd6141bcaad1cc7c3':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:21:58 -07:00
David 'Digit' Turner
402b02f8ec
Merge "ndk: x86: Update android-9 x86 platform files"
2011-06-27 04:39:55 -07:00
Yochai Shefi Simchon
e02b38778a
Fix an iligal "free".
...
m_map[GL_TEXTURE_COORD_ARRAY] is not an allocated pointer, therefore it shouldn't be freed.
Change-Id: I84e2937c16ddcbb8922cdf270de86732ee966d60
2011-06-25 17:02:33 +03:00