Commit Graph

6691 Commits

Author SHA1 Message Date
Xavier Ducrohet
76fb8500d3 am 80f84422: Add v13 to the compatibility package.
* commit '80f844229137cb0d78689ea61aea37da4c770c8c':
  Add v13 to the compatibility package.
2011-06-07 10:48:13 -07:00
David Turner
1ccce78ed6 am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
* commit 'e490d50ed5f5422e386c32b953c0ce79496aa961':
  opengl translator: make GLcommon static library
2011-06-07 02:38:31 -07:00
David Turner
e490d50ed5 am 8c7d5519: Merge "opengl translator: make GLcommon static library"
* commit '8c7d5519e27fb53522da51f2f6bec1c1ac6388a8':
  opengl translator: make GLcommon static library
2011-06-07 02:36:40 -07:00
David Turner
8c7d5519e2 Merge "opengl translator: make GLcommon static library" 2011-06-07 02:29:44 -07:00
Guy Zadikario
cd1489a89c opengl translator: make GLcommon static library
This change turns GLcommon to be static instead of shared
library.
Removed the s_globalNameSpace static object from objectNameManager
and moved it to live inside the EglDisplay object which is shared
for all display space objects (GLESv1, GLESv2 and EGL).

Change-Id: I92fa71fb7cbac423c22b7188e8d9642a5fddf0d9
2011-06-07 11:29:15 +02:00
David Turner
f61e7a3c98 am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
* commit '94f566f86d11536765243342818c94b70200b519':
  opengl translator: moved some types out of eglplatform.h
2011-06-07 02:21:11 -07:00
David Turner
ee00d4b413 am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
* commit '7870c9f5130b86a92ae0d4a40951746d01f65c1c':
  opengl translator: initialize dispatch with dummy functions
2011-06-07 02:21:08 -07:00
David Turner
94f566f86d am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
* commit 'cc3b38874689e963fea10347f11cee3b62635c8e':
  opengl translator: moved some types out of eglplatform.h
2011-06-07 02:08:52 -07:00
David Turner
7870c9f513 am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
* commit '8a96cb7e8bd4b951c4a61df10f2103b65ae3e74c':
  opengl translator: initialize dispatch with dummy functions
2011-06-07 02:08:47 -07:00
David Turner
cc3b388746 Merge "opengl translator: moved some types out of eglplatform.h" 2011-06-07 01:40:48 -07:00
David Turner
8a96cb7e8b Merge "opengl translator: initialize dispatch with dummy functions" 2011-06-07 01:40:33 -07:00
Bruno Oliveira
b30a3010f5 Adds the Random Music Player sample.
This sample illustrates how to write an application that plays media
in the background, handles streaming media from the network and
reacts appropriately to system events like headphone disconnection and
audio focus changes, and also uses the notification system to
keep the user informed about what is happening.

This CL is a cherrypick of the old CL 104495 (originally in
honeycomb-mr1) into honeycomb-mr2. Original CL:
https://android-git.corp.google.com/g/#change,104495

Change-Id: Ib8b15ee920300adc093a8b52c17bd9c251ac74ca
2011-06-07 01:09:21 -04:00
Xavier Ducrohet
80f8442291 Add v13 to the compatibility package.
Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.

Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
2011-06-06 19:21:45 -07:00
David 'Digit' Turner
b257bb8ab4 am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
* commit 'e9c7386b0506f7c2f0bc258e3a899fcbe64adc3e':
  ndk: x86: Sanitize platform headers and libraries.
2011-06-06 17:30:49 -07:00
Dianne Hackborn
b36c8d68a3 am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
* commit '0a9365f82530e63334e023b605f71968b48ce91c':
  Update pager demos to match new v4 ViewPager API.
2011-06-06 15:18:59 -07:00
Dianne Hackborn
0a9365f825 am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
* commit '7ffb7d4b2face7d2ce5cee82c92ec36fd0ba2932':
  Update pager demos to match new v4 ViewPager API.
2011-06-06 15:12:15 -07:00
Dianne Hackborn
7ffb7d4b2f Update pager demos to match new v4 ViewPager API.
Change-Id: I3b0f3382d56b477868b5a5fbf5af22fa83c3e06a
2011-06-06 15:01:45 -07:00
David Turner
638e7d8bd2 am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
* commit '5f82c3ab8fb726376ed2abcb5237c8b90d616edf':
  implementing mac OS support for translator's libs
2011-06-06 09:08:07 -07:00
David Turner
2e8d5e1dab am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
* commit '4de570c974d0d001edd95804eb1a95c1078cfa6b':
  opengl translator: GLSL ES translation
2011-06-06 09:08:05 -07:00
David Turner
9178b80ce4 am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
* commit 'eae0aff8d44e339d8f79b6cadec985e8f9c349e2':
  opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-06 09:07:58 -07:00
David Turner
5f82c3ab8f am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
* commit 'a1b9f9bc1683bc8a69d274f496ac3a0307fe5656':
  implementing mac OS support for translator's libs
2011-06-06 09:04:00 -07:00
David Turner
4de570c974 am f3c023e4: Merge "opengl translator: GLSL ES translation"
* commit 'f3c023e482ac51268c3c30f50c5490afa17773ad':
  opengl translator: GLSL ES translation
2011-06-06 09:03:57 -07:00
David Turner
eae0aff8d4 am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
* commit '87043c4e67c68cff7566265f4c4acb86482bf174':
  opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-06 09:03:55 -07:00
Amit Feller
0db9dae215 opengl translator: moved some types out of eglplatform.h
Some native types like NativeFBConfig and NativeContext are
internal to the translator implementation and should not
exist in the interface headers.
Moved those types from eglplatform.h into eglinternalplatfom.h

Change-Id: I6462a007de8c185deecbb9beebc343ca3626fd0c
2011-06-06 19:01:45 +03:00
Amit Feller
c879e1c8a6 opengl translator: initialize dispatch with dummy functions
Initialize the GLDispatch with dummy function instead of
NULL pointer in case the function does not present on the
host OpenGL library. Prevent ugly segfault when a call to
such function is made.

Change-Id: I3488e60e091af06273a5680accabb7fe30fab066
2011-06-06 19:01:45 +03:00
David Turner
a1b9f9bc16 Merge "implementing mac OS support for translator's libs" 2011-06-06 08:56:45 -07:00
David Turner
f3c023e482 Merge "opengl translator: GLSL ES translation" 2011-06-06 08:56:24 -07:00
David Turner
87043c4e67 Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib" 2011-06-06 08:56:13 -07:00
Amit Feller
3dd22a5450 implementing mac OS support for translator's libs
Change-Id: Ifa12cf1177db49197ad8496f4e0ef8098d43aa8d
2011-06-06 18:45:01 +03:00
Amit Feller
dd26774dac opengl translator: GLSL ES translation
There are some differences between GLSL/ES and Desktop
GLSL. This change translate the GLSL/ES shader source
to be compatible with the desktop GLSL language.

Change-Id: Ia6fdd6a90944926adcf440299b9ea3a4500d1eb1
2011-06-06 18:45:01 +03:00
Amit Feller
d61fb75ef8 opengl translator: added EGL_RENDERABLE_TYPE attrib
fixing bug in eglChooseConfig, there was no referer to
EGL_RENDERABLE_TYPE this caused the eglChooseConfig to fail
when an attribute EGL_RENDERABLE_TYPE was specified in
the attrib_list

Change-Id: Ib4635a55ef3cc0ff380e581d4a41602ddfd32f82
2011-06-06 18:45:01 +03:00
David Turner
e3ca49a949 am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
* commit '3b987d0cd7225feee6813a4893eeefe4f0974d40':
  fixes for gles2 tests
2011-06-06 07:50:14 -07:00
David Turner
3ba3156e13 am a68506a3: am bcec626f: Merge "add gles2 extensions"
* commit 'a68506a3adf44a924d4ed84abf13f558909a1f9b':
  add gles2 extensions
2011-06-06 07:50:12 -07:00
David Turner
1251787f84 am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
* commit '5af3c174af77e7bd33dc5629bf9016eb315d8bc0':
  implement GL_OES_draw_texture
2011-06-06 07:50:10 -07:00
David Turner
e1beb75631 am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
* commit 'f26f4dd753465c22b7508d2f96446cb6da759b6b':
  Add gles 1 extension implementation to translator
2011-06-06 07:50:07 -07:00
David Turner
0777f78ee8 am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
* commit 'a2e0e64af3c891733fadf0a85dc7b8293db285ac':
  removed old/obsolete file GLEScontext.cpp
2011-06-06 07:50:05 -07:00
David Turner
f3c78295e6 am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
* commit 'e6868d1eebdc2057c19ecac23cdff37d9ca2cdd2':
  Fix issues raised by the GLES 1.1 conformance test
2011-06-06 07:50:00 -07:00
David Turner
3b987d0cd7 am a2c959d5: Merge "fixes for gles2 tests"
* commit 'a2c959d5450faeed87b020f74f2e8ac21eaef9b3':
  fixes for gles2 tests
2011-06-06 07:34:43 -07:00
David Turner
a68506a3ad am bcec626f: Merge "add gles2 extensions"
* commit 'bcec626f5a82b83af78705c1adc7326bd0fca9e5':
  add gles2 extensions
2011-06-06 07:34:41 -07:00
David Turner
5af3c174af am 4bf1d504: Merge "implement GL_OES_draw_texture"
* commit '4bf1d5042683fe2064819f2b09b90e18db6dbe7f':
  implement GL_OES_draw_texture
2011-06-06 07:34:39 -07:00
David Turner
f26f4dd753 am ffe663de: Merge "Add gles 1 extension implementation to translator"
* commit 'ffe663de02e1b7e3cc5ca4a064d80bd6ad7f161c':
  Add gles 1 extension implementation to translator
2011-06-06 07:34:37 -07:00
David Turner
a2e0e64af3 am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
* commit '61287c5092b87c384617cb0e06464db247786a48':
  removed old/obsolete file GLEScontext.cpp
2011-06-06 07:34:34 -07:00
David Turner
e6868d1eeb am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
* commit '299a140c60efbc920a948364d28f5c6eaff4ee4f':
  Fix issues raised by the GLES 1.1 conformance test
2011-06-06 07:34:29 -07:00
David Turner
a2c959d545 Merge "fixes for gles2 tests" 2011-06-06 05:22:28 -07:00
David Turner
bcec626f5a Merge "add gles2 extensions" 2011-06-06 05:21:16 -07:00
David Turner
4bf1d50426 Merge "implement GL_OES_draw_texture" 2011-06-06 05:12:13 -07:00
David Turner
ffe663de02 Merge "Add gles 1 extension implementation to translator" 2011-06-06 05:10:59 -07:00
David Turner
61287c5092 Merge "removed old/obsolete file GLEScontext.cpp" 2011-06-06 04:25:26 -07:00
Liran
e4b6d4a629 fixes for gles2 tests
load necessary functions from gl dispatch for gles2
fix usage of global names in some functions
combine the shaders and programs namespace to one

Change-Id: I92bd90a91a5840fcceebd05ab06bebb65bb415a0
2011-06-06 13:22:38 +03:00
Liran
da84d440c6 add gles2 extensions
implement extensions for gles2
add missing entry point for gles1 EGLImage extension

Change-Id: I7cf0118fdf69f3fb2a7023cf97134efd6aabbf59
2011-06-06 13:22:38 +03:00