Commit Graph

6691 Commits

Author SHA1 Message Date
Anirudh Dewani
b79c8d0583 Merge "Adding resizeMode to widget samples." into honeycomb-mr2 2011-06-15 10:57:44 -07:00
David Turner
7b1f606b8c am 1aa6b813: am 7284c53c: am e68305d9: Merge "Handle egl context"
* commit '1aa6b813c267953c19d029c4864f31db58992f98':
  Handle egl context
2011-06-14 13:23:52 -07:00
David Turner
279fd012f2 am 65803c1f: am 3389c10a: am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"
* commit '65803c1fc73dfd52c93dd717b2cea17ac5c84dc9':
  emulator opengl: Create and destroy Surfaces
2011-06-14 13:23:45 -07:00
David Turner
1aa6b813c2 am 7284c53c: am e68305d9: Merge "Handle egl context"
* commit '7284c53cfe1a4f21e487c4d312c4a5b685d82ffb':
  Handle egl context
2011-06-14 12:59:34 -07:00
David Turner
65803c1fc7 am 3389c10a: am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"
* commit '3389c10a1057038b213c85d5180f8199f956c0b8':
  emulator opengl: Create and destroy Surfaces
2011-06-14 12:59:31 -07:00
David Turner
7284c53cfe am e68305d9: Merge "Handle egl context"
* commit 'e68305d9c0ffdb5f99a1b9c62618825bb526e4c4':
  Handle egl context
2011-06-14 12:40:01 -07:00
David Turner
3389c10a10 am 96deb3b2: Merge "emulator opengl: Create and destroy Surfaces"
* commit '96deb3b2c85508cc166097fea92b20326a3f94f9':
  emulator opengl: Create and destroy Surfaces
2011-06-14 12:39:56 -07:00
David Turner
e68305d9c0 Merge "Handle egl context" 2011-06-14 12:12:09 -07:00
David Turner
96deb3b2c8 Merge "emulator opengl: Create and destroy Surfaces" 2011-06-14 12:10:42 -07:00
Dianne Hackborn
ce28e09784 am 67117872: am b181a0d1: Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
* commit '67117872570ae826923c496055d153df473f7740':
  New API demos showing use of tabs with fragments.
2011-06-13 16:38:27 -07:00
Dianne Hackborn
6711787257 am b181a0d1: Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2
* commit 'b181a0d1a8c880449ba58dc8d5798bc39cba2153':
  New API demos showing use of tabs with fragments.
2011-06-13 16:36:31 -07:00
Dianne Hackborn
b181a0d1a8 Merge "New API demos showing use of tabs with fragments." into honeycomb-mr2 2011-06-13 16:33:26 -07:00
Dianne Hackborn
be6b6b494f New API demos showing use of tabs with fragments.
Also various cleanup in other demos.

Change-Id: I4f5669117e28312bcd4b28795c5eca5f4ab6dcfb
2011-06-13 16:27:17 -07:00
Bruno Oliveira
68a87a4ac6 am d0e6d6f7: am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2
* commit 'd0e6d6f71fe5aab3c9faeecfc480ea7d69c5a080':
  Adds the Random Music Player sample.
2011-06-13 14:31:02 -07:00
Bruno Oliveira
d0e6d6f71f am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2
* commit '6f24f89ccb8a4f8a5d86b5e6798ebe2ebab827d2':
  Adds the Random Music Player sample.
2011-06-13 14:27:51 -07:00
Bruno Oliveira
6f24f89ccb Merge "Adds the Random Music Player sample." into honeycomb-mr2 2011-06-13 14:25:26 -07:00
Stas Gurtovoy
a7b7e95b03 emulator opengl: implement eglChooseConfig functionality.
Added new RenderControl command to request the host to execute
the ChooseConfig functionality.

Change-Id: Ib92be313a6df740de69d671c6994ec6cae17ea13
2011-06-11 00:16:21 +03:00
Stas Gurtovoy
33dc9add2a emulator opengl: some system egl fixes after a review.
Change-Id: I4a0c72319e8c69fba8ac00ed7bfff7667ae07269
2011-06-11 00:16:21 +03:00
Stas Gurtovoy
c36ac6ed2f emulator opengl: moved gralloc buffer handle struct to be shared.
We need to share the cb_hande_t between gralloc/EGL/GLES, moved it
into the opengl system common lib.
Also added eglSwapBuffers implementation.

Change-Id: Ia461a48c273af42293aafcf084e457adf03cbed3
2011-06-11 00:16:21 +03:00
Stas Gurtovoy
dd0a3777bc Handle egl context
Added EGLContext functionality to emulator's accelerated EGL implementation.

Change-Id: Idde7d701808839f8d89c6c081a9f3216bdea7a52
2011-06-11 00:16:20 +03:00
Stas Gurtovoy
8a8c601c4f emulator opengl: Create and destroy Surfaces
Also fixed link failure.

Change-Id: I4cbe28b2d51a5d4e48c4cba72df64f9df0898da5
2011-06-11 00:15:19 +03:00
David Turner
e41a5eac82 am 7b659b11: am 742a85dc: am 0e5c2beb: Merge "First commit of the system egl implementation."
* commit '7b659b11401998b80227052c13ed7dfd7bee2f60':
  First commit of the system egl implementation.
2011-06-10 10:07:13 -07:00
David Turner
7b659b1140 am 742a85dc: am 0e5c2beb: Merge "First commit of the system egl implementation."
* commit '742a85dc4b342c53b29fbbb68d15ea8f10f5af1b':
  First commit of the system egl implementation.
2011-06-10 08:42:13 -07:00
David Turner
742a85dc4b am 0e5c2beb: Merge "First commit of the system egl implementation."
* commit '0e5c2beb132d87f1190ab8d2aa9edde2563007f9':
  First commit of the system egl implementation.
2011-06-10 08:16:35 -07:00
David Turner
0e5c2beb13 Merge "First commit of the system egl implementation." 2011-06-10 07:21:31 -07:00
Anirudh Dewani
cd5e69361d Adding resizeMode to widget samples.
Change-Id: I60e43f4f2f3726f7b268f532f2da86913df72982
2011-06-10 16:46:40 +05:30
Stas Gurtovoy
37db3deb7b First commit of the system egl implementation.
At this point system/egl should build without errors

Change-Id: Ieabae930fc20a8df4f3d68f179d685401e946e74
2011-06-09 21:24:26 +03: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
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
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