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
Liran
d94a2efe6a
implement GL_OES_draw_texture
...
Change-Id: I9f91fa63dab0cf769dd5ee609c96d1143122991c
2011-06-06 13:22:38 +03:00
Liran
3b7e5e3281
Add gles 1 extension implementation to translator
...
This fix addes to the Translator the implementations of theses extensions:
GL_EXT_texture_format_BGRA8888
GL_OES_blend_equation_separate
GL_OES_blend_func_separate
GL_OES_blend_subtract
GL_OES_depth24
GL_OES_matrix_palette
GL_OES_extended_matrix_palette
GL_OES_element_index_uint
GL_OES_framebuffer_object
GL_OES_packed_depth_stencil
GL_OES_point_size_array
GL_OES_point_sprite
GL_OES_read_format
GL_OES_stencil_wrap
GL_OES_texture_env_crossbar
GL_OES_texture_cube_map
GL_OES_texture_mirrored_repeat
Change-Id: I472808d123ec0e03279137a48d89dc4b19023758
2011-06-06 13:22:30 +03:00
Guy Zadikario
a7f83c0565
removed old/obsolete file GLEScontext.cpp
...
Change-Id: I82f21eef958e37515b46279cf2b44386320723ca
2011-06-06 13:19:26 +03:00
David Turner
299a140c60
Merge "Fix issues raised by the GLES 1.1 conformance test"
2011-06-06 01:50:56 -07:00
Yochai Shefi Simchon
3150361b51
Fix issues raised by the GLES 1.1 conformance test
...
- Most of the fixes are about unhandled enums.
- Adding an unbindBuffer method to GLEScontext, and use it in the
glDeleteBuffers call, so a buffer is not considered bound after
it has been deleted.
- Handle the case where a call to glCompressedTexImage2D gets
NULL as its data (in which case the uncompressTexture function
should only calculate the output format, but not attempt to
uncompress the NULL data).
- A few segfaults.
Change-Id: I6a856ea6da1be3b15b41140d6383508a6803897c
2011-06-05 13:34:27 +03:00
David Turner
f68103bf0d
am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
...
* commit '1e4d92cadfb443b0128f615b64b74b6730fd2f32':
Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-03 18:38:21 -07:00
David Turner
b848ebfedc
am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
...
* commit '62f593fa2daf2ebc1ba3d10dc4a46dbd2ef3bf39':
Fix a mess in contexts/surfaces reference count
2011-06-03 18:38:18 -07:00
David Turner
1e4d92cadf
am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
...
* commit '67032b23966bc0a7231b2d6825ac2f1cf84e9949':
Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-03 18:19:21 -07:00
David Turner
62f593fa2d
am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
...
* commit '7660bb5806c285bc5646ad5868b9197012943bcb':
Fix a mess in contexts/surfaces reference count
2011-06-03 18:19:17 -07:00
Dianne Hackborn
7a16938f3a
am b6991d5c: am a6cadd62: am 47f569e4: Lost and found.
...
* commit 'b6991d5cf17506af0cea039aad4e0ee1ab379449':
Lost and found.
2011-06-03 17:34:52 -07:00
Andy Stadler
840f368951
am 14eda725: (-s ours) am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
...
* commit '14eda7256c58e435e9bfad2f0d45e1f6bd715d68':
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 16:35:16 -07:00
Dianne Hackborn
f32273ce7d
am 6faeacbb: am 068fa0c3: am 72d2e5c1: New demos for the v13 support library.
...
* commit '6faeacbbc561161a84a26e951f896880baa91ce5':
New demos for the v13 support library.
2011-06-03 16:21:41 -07:00
David Turner
67032b2396
Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
2011-06-03 15:17:00 -07:00
David Turner
7660bb5806
Merge "Fix a mess in contexts/surfaces reference count"
2011-06-03 14:59:41 -07:00
Dianne Hackborn
b6991d5cf1
am a6cadd62: am 47f569e4: Lost and found.
...
* commit 'a6cadd6244b4c0045ccb571881af982267b4ee9c':
Lost and found.
2011-06-03 13:33:06 -07:00
Dianne Hackborn
a6cadd6244
am 47f569e4: Lost and found.
...
* commit '47f569e460adaef04b75174706b7c95471567ca8':
Lost and found.
2011-06-03 13:17:32 -07:00
Dianne Hackborn
df92d5c5f6
Fix build.
...
Change-Id: If9c9289f63f98a8108452020fa28aa16b1d4a78e
2011-06-03 13:09:42 -07:00
Dianne Hackborn
47f569e460
Lost and found.
...
Change-Id: I3aa4824e2c2157be715d93b698963c54dd98e099
2011-06-03 12:31:09 -07:00
Dianne Hackborn
d190f3b9d0
resolved conflicts for merge of faf6dcd6 to master
...
Change-Id: I637e2982daefb7c4800ed31bc4cadbfb16cc2c81
2011-06-03 11:05:47 -07:00
Andy Stadler
14eda7256c
am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
...
* commit 'dfb979cd631ef552b627a94a6e88eec6a2db655a':
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:33:09 -07:00
Andy Stadler
dfb979cd63
am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
...
* commit '7e408e8be4cd546206b45c51fa41cc09939dbe33':
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:28:42 -07:00
Andy Stadler
7e408e8be4
Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
2011-06-03 10:24:20 -07:00
Dianne Hackborn
6faeacbbc5
am 068fa0c3: am 72d2e5c1: New demos for the v13 support library.
...
* commit '068fa0c33bf92ca63a07a93f09e98324c9443709':
New demos for the v13 support library.
2011-06-02 19:49:40 -07:00
Dianne Hackborn
068fa0c33b
am 72d2e5c1: New demos for the v13 support library.
...
* commit '72d2e5c1b9bbd96a38035781790ca14dd59b15b8':
New demos for the v13 support library.
2011-06-02 19:48:21 -07:00
Dianne Hackborn
72d2e5c1b9
New demos for the v13 support library.
...
Change-Id: I79a727f987d3b21274e1f9ee6359caa2231c258b
2011-06-02 19:44:57 -07:00
David 'Digit' Turner
6a517b0612
am 91641c03: am c1b7604a: am 18fc9b3e: Merge "ndk: Update libc.a to Gingerbread version."
...
* commit '91641c03b03d7c2a4e187fcb22615799314a8439':
ndk: Update libc.a to Gingerbread version.
2011-06-02 18:52:26 -07:00
Andy Stadler
547494ef8a
DO NOT MERGE Replacement sample code for DevicePolicyManager api.
...
* UI is organized into multiple screens to make it easier to understand
* More feedback about local vs global (aggregate) policies
* Uses preference fragments for modern appearance
Backport of: I075161d389942786e6c95483becbff7ebe847078
Change-Id: Ie88c1577b2ebae124615cc4b45968851cf11187e
2011-06-02 16:39:17 -07:00
Alex Sakhartchouk
eb6146ea4c
Building with full librs
...
Change-Id: I0ccb24e97095978c0052cb1af735966bbfa740e7
2011-06-02 12:23:52 -07:00
Jean-Baptiste Queru
6d0d6ef159
am fc618484: Merge from gingerbread
...
* commit 'fc618484abdca2f2378c1aa3dcbe1abe8a9a7f7f':
2011-06-01 14:26:31 -07:00
Jean-Baptiste Queru
fc618484ab
Merge from gingerbread
...
Change-Id: I85fd33e5db2744f78166b3d879e9e664a06653e3
2011-06-01 14:12:20 -07:00
Andy Stadler
98ff2036ec
Add support lib src for Launcher2
...
Change-Id: Ie1b5036cfacab233d78e65447490b1fed9a8c4fd
2011-06-01 12:01:18 -07:00
Andy Stadler
5c70b4559d
Merge "Replacement sample code for DevicePolicyManager api."
2011-05-31 16:06:56 -07:00
David Turner
5eac0624d2
am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
...
* commit '8821d5a56e5d881908bbee28004d6e6a3e8a220c':
ThreadInfo- use explicit rather than void pointers
2011-05-31 14:39:40 -07:00
David Turner
3f232d3058
am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
...
* commit '0b05185e00ac8cdf6c8c6e9b86bb67603455f25e':
Fix version returned by eglInitialize from 4.1 to 1.4.
2011-05-31 14:34:58 -07:00
David Turner
9448b1c282
am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit '8c141dd2c012733feb7fedce6e96a2c3f13c5c6c':
EglChooseConfig should handle the case where "configs" is NULL.
2011-05-31 14:32:05 -07:00
David Turner
8821d5a56e
Merge "ThreadInfo- use explicit rather than void pointers"
2011-05-31 14:28:48 -07:00
David Turner
0b05185e00
Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
2011-05-31 14:11:00 -07:00
David Turner
8c141dd2c0
Merge "EglChooseConfig should handle the case where "configs" is NULL."
2011-05-31 13:58:18 -07:00
Stephen Hines
0ed4da6881
Merge "Simplify HelloCompute example. :)"
2011-05-31 13:00:55 -07:00
Dianne Hackborn
faf6dcd6cd
am 94703eef: am 10c33528: Extract support lib samples out of ApiDemos and in to their own app.
...
* commit '94703eef4ce1a5dcfd8ed1a001a41374ec51f94a':
Extract support lib samples out of ApiDemos and in to their own app.
2011-05-31 10:54:18 -07:00
Dianne Hackborn
94703eef4c
am 10c33528: Extract support lib samples out of ApiDemos and in to their own app.
...
* commit '10c33528e033643099783a5bc4eedb4b8a1e9a0e':
Extract support lib samples out of ApiDemos and in to their own app.
2011-05-31 10:51:48 -07:00
Andy Stadler
0879ed418d
Replacement sample code for DevicePolicyManager api.
...
* UI is organized into multiple screens to make it easier to understand
* More feedback about local vs global (aggregate) policies
* Uses preference fragments for modern appearance
Change-Id: I075161d389942786e6c95483becbff7ebe847078
2011-05-31 10:14:27 -07:00
David Turner
6d70e8c39e
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 GLcommon fold
...
* commit 'bf483268fc2651ea926217851ceea0329e0bb476':
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-05-31 08:03:53 -07:00