Commit Graph

6691 Commits

Author SHA1 Message Date
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
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
47f569e460 Lost and found.
Change-Id: I3aa4824e2c2157be715d93b698963c54dd98e099
2011-06-03 12:31:09 -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
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
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
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
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
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
Yochai Shefi Simchon
889d928f29 Fix a bug where eglMakeCurrent(NULL) did not work
This happened because the VALIDATE macros terminated the function prematurally.
Also clear the surface bindings from the previous context.

Change-Id: I33d587f5e877caa6ec651a04ff887e0c77a9d5f3
2011-05-31 15:01:59 +03:00
Yochai Shefi Simchon
88ec3acc83 Fix a mess in contexts/surfaces reference count
The main issue was that SmartPtr had an implicit cast to void*, returning its
internal pointer. This allowed writing unsafe code, since the internal pointer
could be handled without increasing its ref count.
So, removed this cast and fixed the various places which relied on it.
Also, fix two calls to "destroy" ahich should have been "markForDestruction".
The naming is not good, should probably change it in a later patch.

Change-Id: Idabc800e97649b2e2404fb7387d25deac70af62e
2011-05-31 15:01:59 +03:00
Yochai Shefi Simchon
eada5b81de ThreadInfo- use explicit rather than void pointers
Replace the void* pointers with explicit pointers for EglContext, EglDisplay
and GLEScontext. Use forward declarations. This is to improve finding errors
in compile time rather than on run time.

Change-Id: Iaec3c36c1e12f36b37d34f68e9d8aa58ff1b30c0
2011-05-31 14:59:20 +03:00
Yochai Shefi Simchon
094026698e Fix version returned by eglInitialize from 4.1 to 1.4.
Change-Id: I43f3512374f546a81b7cfbba8959ce9f0ed7fe53
2011-05-31 14:15:02 +03:00
Yochai Shefi Simchon
aac7fe282c EglChooseConfig should handle the case where "configs" is NULL.
Change-Id: I236afdfc73eb5dd5a3ab19e2b388772ea297bdb4
2011-05-31 14:13:26 +03:00
David Turner
bf483268fc 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 folder." 2011-05-30 08:18:32 -07:00
Amit Feller
624176d51a 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.

GLESv2Imp - includes GLES 2.0 entry points implementation

Change-Id: I934fb963478a7f596d824612f847a5aa77d2ed9d
2011-05-30 11:06:24 +03:00
David 'Digit' Turner
91641c03b0 am c1b7604a: am 18fc9b3e: Merge "ndk: Update libc.a to Gingerbread version."
* commit 'c1b7604a096ca32513b04c322fce1a0c550de099':
  ndk: Update libc.a to Gingerbread version.
2011-05-29 08:59:31 -07:00
Dianne Hackborn
10c33528e0 Extract support lib samples out of ApiDemos and in to their own app.
Change-Id: I2ca344e5f1b44c4825de938c9a4f9375a523ede5
2011-05-27 18:40:15 -07:00
David 'Digit' Turner
e9c7386b05 am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
* commit 'e011bed42965ee0488e11b537a4705c262140c3f':
  ndk: x86: Sanitize platform headers and libraries.
2011-05-27 11:19:17 -07:00
David 'Digit' Turner
e011bed429 Merge "ndk: x86: Sanitize platform headers and libraries." 2011-05-27 10:26:04 -07:00
David 'Digit' Turner
3e1498c4c4 ndk: x86: Sanitize platform headers and libraries.
This change sanitizes the x86-specific platform headers and libraries.
It does two things:

- Remove the stuff under android-3/arch-x86

- Update the content of android-9/arch-x86 from a recent AOSP
  full_x86-eng build (see caveats below).

Some files appear to move because they didn't change (e.g. kernel headers).

This change was generated by following these steps:

1/ Build full_x86-eng from the AOSP tree

2/ From $ANDROID_ROOT/ndk, run:

   build/tools/dev-system-import.sh --direct --arch=x86 9

3/ Under $ANDROID_ROOT/development/ndk, do:

   git rm -r android-3/arch-x86
   git add android-9/arch-x86
   git checkout -- android-9/include
   git ls-files -o | xargs rm
   git commit

IMPORTANT:
   The AOSP tip-of-tree used to generate these files
   includes post-Gingerbread changes !!

   The final version of the android-9/arch-x86 files will have to
   be generated from the gingerbread branch after we back-port all
   x86-support changes to it.

   These binaries are thus not final, but can be used to generate
   working experimental NDK packages, including prebuilt GNU libstdc++
   and STLport binaries that implement -fstack-protector correctly.

Change-Id: I260896185a098b9b356bd26f492692e4a4f66f8f
2011-05-27 06:14:16 +02:00
David 'Digit' Turner
c1b7604a09 am 18fc9b3e: Merge "ndk: Update libc.a to Gingerbread version."
* commit '18fc9b3eca4ca8e7435b6e679a249449f6fa739b':
  ndk: Update libc.a to Gingerbread version.
2011-05-24 02:58:56 -07:00
David 'Digit' Turner
18fc9b3eca Merge "ndk: Update libc.a to Gingerbread version." 2011-05-24 02:21:36 -07:00
David 'Digit' Turner
509176259d ndk: Update libc.a to Gingerbread version.
This updates the static C library version provided with
the NDK to the version from the AOSP gingerbread-release
branch, more specifically using the platform/bionic.git SHA1 of:

    3f14ff34dfbd00fcffb18b10a1a3e17e2cc5ebdf

This file is only used to rebuild a gdbserver binary. This version
contains changes necessary to fix gdbserver crashing issues on
certain Honeycomb devices.

You will need to rebuild the NDK gdbserver binary after this patch
is submitted (see build/tools/build-gdbserver.sh --help).

Change-Id: Iab7ff707a9bdbdca0d0fd017178e25da9d48e43d
2011-05-24 03:56:38 +02:00
Dianne Hackborn
339a6666bf am c7ec100c: am 193d98ec: Add new API demo for -swNNNdp resource qualifier.
* commit 'c7ec100ccb5266a3c480eb2563a511b86d106d10':
  Add new API demo for -swNNNdp resource qualifier.
2011-05-19 19:34:15 -07:00
Dianne Hackborn
c7ec100ccb am 193d98ec: Add new API demo for -swNNNdp resource qualifier.
* commit '193d98ec183f4a3e137b8d0c5e20529819e1eef2':
  Add new API demo for -swNNNdp resource qualifier.
2011-05-19 19:30:28 -07:00
Dianne Hackborn
193d98ec18 Add new API demo for -swNNNdp resource qualifier.
Also clean up the demo for the w/h qualifiers to use numbers
that are the same as what we will be recommending.

Change-Id: I87ed35d8dfcb41985e19f450f7853f883effd207
2011-05-19 18:23:29 -07:00