David Turner
043c059459
am 58c9ec5a: am 1ccce78e: am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
...
* commit '58c9ec5af90a37cf38a72e5145c212418ef7ecbf':
opengl translator: make GLcommon static library
2011-06-09 11:17:44 -07:00
David Turner
416c517f80
am 0e4f5620: am f61e7a3c: am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
...
* commit '0e4f5620922694b1ec2a05371c4365ab43af0767':
opengl translator: moved some types out of eglplatform.h
2011-06-09 11:17:39 -07:00
David Turner
5ebbc3a011
am 8d6b45e8: am ee00d4b4: am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
...
* commit '8d6b45e860d642979198445d09bb8f8103026546':
opengl translator: initialize dispatch with dummy functions
2011-06-09 11:17:14 -07:00
Alex Sakhartchouk
5e893e1887
Merge "Building with full librs"
2011-06-09 09:42:33 -07:00
Ying Wang
5146b97fc8
am 534f6c2d: am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.
...
* commit '534f6c2de59e707a76bb10137ae013b630a03a2f':
Use a function to package android support libraries.
2011-06-08 17:32:20 -07:00
David Turner
0b743e78a5
am b6b866c5: am 638e7d8b: am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
...
* commit 'b6b866c5a9f6cca5492b20b9ecbb6ba8b1b1abcf':
implementing mac OS support for translator's libs
2011-06-08 14:49:06 -07:00
David Turner
c0858766c4
am 1a77f754: am 2e8d5e1d: am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
...
* commit '1a77f754d1c11113fe863ee6ea8b09d639c8c6b3':
opengl translator: GLSL ES translation
2011-06-08 14:49:02 -07:00
David Turner
593737d5c3
am a3d243e0: am 9178b80c: am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
...
* commit 'a3d243e00f283e2671d834f5584eae5562b09706':
opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-08 14:48:59 -07:00
David Turner
3466ceddc5
am 3d03d485: am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
...
* commit '3d03d4854b9c820b95ca58e6b39477ae314812b1':
fixes for gles2 tests
2011-06-08 14:48:50 -07:00
David Turner
0a5263397a
am 8c5259cd: am 3ba3156e: am a68506a3: am bcec626f: Merge "add gles2 extensions"
...
* commit '8c5259cd486321a0c3a23a34a232c38b7a19c8dc':
add gles2 extensions
2011-06-08 14:48:47 -07:00
David Turner
124643d59a
am f19483e5: am 1251787f: am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
...
* commit 'f19483e5351e9d34de24985f552685bd6791f05e':
implement GL_OES_draw_texture
2011-06-08 14:48:43 -07:00
David Turner
e31f32985f
am d07b6c87: am e1beb756: am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
...
* commit 'd07b6c87fe38930a6b02f90da4c06fc30c0dabd5':
Add gles 1 extension implementation to translator
2011-06-08 14:48:38 -07:00
David Turner
b693bff96e
am c89cd7af: am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
...
* commit 'c89cd7afa4909a4df20d0e39234ae1a6afb2012d':
removed old/obsolete file GLEScontext.cpp
2011-06-08 14:48:34 -07:00
David Turner
f674de8877
am ea4284a7: am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
...
* commit 'ea4284a78a1fd4ce5dec93a3ef78672d9a7d9d39':
Fix issues raised by the GLES 1.1 conformance test
2011-06-08 14:48:30 -07:00
David Turner
cd25a18fec
am 0677b7a1: am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
...
* commit '0677b7a1e3e59da389cb78f372818ea8105b092e':
Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-08 14:48:25 -07:00
David Turner
2d6f324464
am 0c5fb2ee: am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
...
* commit '0c5fb2eea730548d0f0e64b8383f7d43e0c02bf0':
Fix a mess in contexts/surfaces reference count
2011-06-08 14:48:10 -07:00
Jean-Baptiste Queru
1283d8dd35
am 331b2a6f: am 6d0d6ef1: am fc618484: Merge from gingerbread
...
* commit '331b2a6f8345325c5a8b312a428aaea9192a455b':
2011-06-08 14:47:59 -07:00
David Turner
184bfc4347
am 01dca04f: am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
...
* commit '01dca04f26c9ef07f39501a1ea69910abc2dc932':
ThreadInfo- use explicit rather than void pointers
2011-06-08 14:47:49 -07:00
David Turner
f4db81ba3d
am 1a34e175: am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
...
* commit '1a34e175fcad09fd38eac6f63f5d526728a610f8':
Fix version returned by eglInitialize from 4.1 to 1.4.
2011-06-08 14:47:38 -07:00
David Turner
3b2f4ee1a8
am f90611b8: am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit 'f90611b8400d03c0d2ed5a29ab741cbcab18fad6':
EglChooseConfig should handle the case where "configs" is NULL.
2011-06-08 14:47:32 -07:00
David Turner
dc4a727fb9
am cb802ae3: am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_C
...
* commit 'cb802ae3d9ece422dca25e98e153a65b172e3192':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-08 14:47:22 -07:00
Brett Chabot
0e5c937ff7
Merge "Fix runtest build step."
2011-06-08 13:56:42 -07:00
Brett Chabot
546a3285ce
Fix runtest build step.
...
Update make syntax to new 'mmm' logic.
Bug 4556556
Change-Id: Ie1fd5f6714ee7ef731b063751e0ddd674bc31021
2011-06-07 19:21:11 -07:00
Xavier Ducrohet
f3fdaca576
am 733342c7: am 76fb8500: am 80f84422: Add v13 to the compatibility package.
...
* commit '733342c71260e8ae4d158848eb4629f550761350':
Add v13 to the compatibility package.
2011-06-07 17:53:59 -07:00
David 'Digit' Turner
5ac5b707bb
am b257bb8a: am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
...
* commit 'b257bb8ab4a18e6683aec64389305e179f6eb86b':
ndk: x86: Sanitize platform headers and libraries.
2011-06-07 17:16:35 -07:00
David Turner
58c9ec5af9
am 1ccce78e: am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
...
* commit '1ccce78ed693b7e796289e388bab2d6e200bcbdb':
opengl translator: make GLcommon static library
2011-06-07 15:13:35 -07:00
David Turner
0e4f562092
am f61e7a3c: am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
...
* commit 'f61e7a3c985e8883efa6de35d9fec877be9f51fe':
opengl translator: moved some types out of eglplatform.h
2011-06-07 15:13:33 -07:00
David Turner
8d6b45e860
am ee00d4b4: am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
...
* commit 'ee00d4b4138a2f3c2b4049289564724194fb9450':
opengl translator: initialize dispatch with dummy functions
2011-06-07 15:13:30 -07:00
Brett Chabot
97748e0099
Merge "Make runtest reboot and root more robust."
2011-06-07 15:13:20 -07:00
Ying Wang
534f6c2de5
am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.
...
* commit '514c8cb5f622eaa389a7b50a69582ebf9e6c5d21':
Use a function to package android support libraries.
2011-06-07 14:02:13 -07:00
Ying Wang
514c8cb5f6
am e4ccbd68: Use a function to package android support libraries.
...
* commit 'e4ccbd68ec540739819bea7e109d29d08a54122a':
Use a function to package android support libraries.
2011-06-07 13:59:27 -07:00
David Turner
b6b866c5a9
am 638e7d8b: am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
...
* commit '638e7d8bd223772317b9939cbf84516cdd88a5f5':
implementing mac OS support for translator's libs
2011-06-07 13:25:16 -07:00
David Turner
1a77f754d1
am 2e8d5e1d: am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
...
* commit '2e8d5e1dabd51a147317c01ad894591465fe45a0':
opengl translator: GLSL ES translation
2011-06-07 13:25:07 -07:00
David Turner
a3d243e00f
am 9178b80c: am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
...
* commit '9178b80ce4951119f8ecac7a595e0d2a1b4abdb9':
opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-07 13:24:59 -07:00
David Turner
3d03d4854b
am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
...
* commit 'e3ca49a9495e5cd36b5cd3bcd163e11758a4e4cf':
fixes for gles2 tests
2011-06-07 13:24:54 -07:00
David Turner
8c5259cd48
am 3ba3156e: am a68506a3: am bcec626f: Merge "add gles2 extensions"
...
* commit '3ba3156e134953a88648ab8a732b291651eaafa4':
add gles2 extensions
2011-06-07 13:24:51 -07:00
David Turner
f19483e535
am 1251787f: am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
...
* commit '1251787f846dd73ff1cc739064947586a98f301f':
implement GL_OES_draw_texture
2011-06-07 13:24:47 -07:00
David Turner
d07b6c87fe
am e1beb756: am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
...
* commit 'e1beb756312c647b938b875f28177ec87c5c99f2':
Add gles 1 extension implementation to translator
2011-06-07 13:24:42 -07:00
David Turner
c89cd7afa4
am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
...
* commit '0777f78ee81b4089f88290af82db2055906a73ab':
removed old/obsolete file GLEScontext.cpp
2011-06-07 13:24:38 -07:00
David Turner
ea4284a78a
am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
...
* commit 'f3c78295e6d7415b9899778f07ff7ba32ede136e':
Fix issues raised by the GLES 1.1 conformance test
2011-06-07 13:24:34 -07:00
David Turner
0677b7a1e3
am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
...
* commit 'f68103bf0df892b35c66615efd4c504ef7e96918':
Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-07 13:24:29 -07:00
David Turner
0c5fb2eea7
am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
...
* commit 'b848ebfedca6087a327ffab2c402828398241b0a':
Fix a mess in contexts/surfaces reference count
2011-06-07 13:24:24 -07:00
Jean-Baptiste Queru
331b2a6f83
am 6d0d6ef1: am fc618484: Merge from gingerbread
...
* commit '6d0d6ef1598502c20776d443ad93e18b036443be':
2011-06-07 13:23:33 -07:00
David Turner
01dca04f26
am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
...
* commit '5eac0624d2307ee537d0b4ee6587a02738118c29':
ThreadInfo- use explicit rather than void pointers
2011-06-07 13:22:24 -07:00
David Turner
1a34e175fc
am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
...
* commit '3f232d30586cddb9b463c7557095906fd58a2db7':
Fix version returned by eglInitialize from 4.1 to 1.4.
2011-06-07 13:22:18 -07:00
David Turner
f90611b840
am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit '9448b1c2822eaf7a55ceaa3feefa88941d8b47d9':
EglChooseConfig should handle the case where "configs" is NULL.
2011-06-07 13:22:13 -07:00
David Turner
cb802ae3d9
am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
...
* commit '6d70e8c39ec00488ce8acb94d39a77072d9ef465':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-07 13:21:44 -07:00
Ying Wang
e4ccbd68ec
Use a function to package android support libraries.
...
Change-Id: I52240b31fba7728b74d57fd806a93988e3ac8fe9
2011-06-07 11:25:07 -07:00
Dianne Hackborn
518936d32b
am b36c8d68: am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
...
* commit 'b36c8d68a33d12086bf74ccaa826e8dae67ce673':
Update pager demos to match new v4 ViewPager API.
2011-06-07 11:13:47 -07:00
Xavier Ducrohet
733342c712
am 76fb8500: am 80f84422: Add v13 to the compatibility package.
...
* commit '76fb8500d32e0d9a64b2d00522237d6d8f7a71e9':
Add v13 to the compatibility package.
2011-06-07 10:58:00 -07:00