Commit Graph

6884 Commits

Author SHA1 Message Date
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
Gilles Debunne
e27049a31a XmlAdapters sample example no longer depends on hidden XmlDocumentProvider
Bug 4477831

New changes. Copied code from protected methods to make the example stand-alone.

Change-Id: Ic6592811251090a634743d3d0383b4fd7b046c2f
2011-06-13 18:30:35 -07:00
Dianne Hackborn
b6d84fde9f resolved conflicts for merge of ce28e097 to master
Change-Id: Iced68c2dbae177b59aa6f3862868e68836be2afd
2011-06-13 17:21:25 -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
bc85db5f97 am 68a87a4a: am d0e6d6f7: am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2
* commit '68a87a4ac6eb7a2b991de8b6df53638015ed9e12':
  Adds the Random Music Player sample.
2011-06-13 15:42:40 -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
David Turner
67b3e5aba4 am e41a5eac: am 7b659b11: am 742a85dc: am 0e5c2beb: Merge "First commit of the system egl implementation."
* commit 'e41a5eac82209d2ea78c92427ffc58ec15614cf1':
  First commit of the system egl implementation.
2011-06-10 15:20:44 -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
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